diff --git a/flake.lock b/flake.lock
index e16ed9b..3f04b1f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -245,11 +245,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752780124,
-        "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=",
+        "lastModified": 1758463745,
+        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c718918222bdb104397762dea67e6b397a7927fe",
+        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
         "type": "github"
       },
       "original": {
@@ -424,11 +424,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1752666637,
-        "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=",
+        "lastModified": 1762463231,
+        "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153",
+        "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226",
         "type": "github"
       },
       "original": {
@@ -456,11 +456,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1752620740,
-        "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=",
+        "lastModified": 1762498405,
+        "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e",
+        "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1",
         "type": "github"
       },
       "original": {
@@ -550,11 +550,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1752747119,
-        "narHash": "sha256-2Kp9St3Pbsmu+xMsobLcgzzUxPvZR7alVJWyuk2BAPc=",
+        "lastModified": 1762361079,
+        "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fa0ef8a6bb1651aa26c939aeb51b5f499e86b0ec",
+        "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5",
         "type": "github"
       },
       "original": {
@@ -711,11 +711,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1752747119,
-        "narHash": "sha256-2Kp9St3Pbsmu+xMsobLcgzzUxPvZR7alVJWyuk2BAPc=",
+        "lastModified": 1762361079,
+        "narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "fa0ef8a6bb1651aa26c939aeb51b5f499e86b0ec",
+        "rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b8e2cd9..617fb83 100644
--- a/flake.nix
+++ b/flake.nix
@@ -85,16 +85,6 @@
 
     nixosConfigurations = {
       ayanami = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = {
-          inherit inputs;
-        };
-        modules = [
-          ./hosts/ayanami/configuration.nix
-          nixos-hardware.nixosModules.lenovo-thinkpad-l480
-        ];
-      };
-      ayanami-new = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = {
           inherit inputs;
@@ -110,7 +100,8 @@
             };
           }
 
-          ./hosts/ayanami-new/configuration.nix
+          ./hosts/ayanami/configuration.nix
+          nixos-hardware.nixosModules.lenovo-thinkpad-p14s-amd-gen2
         ];
       };
       soryu-old = nixpkgs.lib.nixosSystem {
diff --git a/hosts/ayanami/configuration.nix b/hosts/ayanami/configuration.nix
index 4220038..3f1e6f9 100644
--- a/hosts/ayanami/configuration.nix
+++ b/hosts/ayanami/configuration.nix
@@ -8,7 +8,6 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../common/builder.nix
     ];
 
 
@@ -16,6 +15,7 @@
     repositoryFile = "/root/restic-main-repo";
     passwordFile = "/root/restic-main-password";
     pruneOpts = [
+      "-keep-tag keep"
       "--keep-last 2"
       "--keep-within 3d"
       "--keep-daily 7"
@@ -34,8 +34,8 @@
 
       "/home/*/.cargo"
 
-      "/home/*/.local/share/Steam/*"
       "!/home/*/.local/share/Steam/compatdata"
+      "/home/*/.local/share/Steam/*"
 
       "/home/*/mnt"
     ];
@@ -200,6 +200,26 @@
 #  services.ipfs.enable = true;
 #  services.ipfs.gatewayAddress = "/ip4/127.0.0.1/tcp/5002";
 
+  nix.distributedBuilds = true;
+  nix.buildMachines = [
+    { hostName = "soryu";
+      system = "x86_64-linux";
+      maxJobs = 16;
+      supportedFeatures = [ "big-parallel" ];
+      speedFactor = 66317;
+    }
+    # { hostName = "bolle.pbsds.net";
+    #   system = "x86_64-linux";
+    #   maxJobs = 6;
+    #   speedFactor = 12857;
+    # }
+    # { hostName = "garp.pbsds.net";
+    #   system = "x86_64-linux";
+    #   maxJobs = 4;
+    #   # i7-6700
+    #   speedFactor = 8088;
+    # }
+  ];
   nix.trustedUsers = [ "daniel" ];
   nix.extraOptions = ''
     experimental-features = nix-command flakes