diff --git a/systems/bob/hardware.nix b/systems/bob/hardware.nix
index 738ccdc..7bcc1ad 100644
--- a/systems/bob/hardware.nix
+++ b/systems/bob/hardware.nix
@@ -50,8 +50,8 @@
       fsType = "zfs";
     };
 
-    "/nix_build" = {
-      device = "root_pool/nix_build";
+    "/nix/var/nix/builds" = {
+      device = "root_pool/nix/var/nix/builds";
       fsType = "zfs";
     };
 
diff --git a/systems/brain/hardware.nix b/systems/brain/hardware.nix
index f17d099..d0b613f 100644
--- a/systems/brain/hardware.nix
+++ b/systems/brain/hardware.nix
@@ -53,8 +53,8 @@
       fsType = "zfs";
     };
 
-    "/nix_build" = {
-      device = "root_pool/nix_build";
+    "/nix/var/nix/builds" = {
+      device = "root_pool/nix/var/nix/builds";
       fsType = "zfs";
     };
 
diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix
index de3165c..494df08 100644
--- a/systems/jeeves/default.nix
+++ b/systems/jeeves/default.nix
@@ -24,10 +24,6 @@ in
     ./runners
     ./syncthing.nix
   ];
-  nix.settings.system-features = lib.mkAfter [
-    "gccarch-x86-64-v2"
-    "gccarch-x86-64-v3"
-  ];
 
   services = {
     openssh.ports = [ 629 ];
diff --git a/systems/jeeves/hardware.nix b/systems/jeeves/hardware.nix
index a7b957d..b837c04 100644
--- a/systems/jeeves/hardware.nix
+++ b/systems/jeeves/hardware.nix
@@ -96,8 +96,8 @@ in
       fsType = "zfs";
     };
 
-    "/nix_build" = {
-      device = "root_pool/nix_build";
+    "/nix/var/nix/builds" = {
+      device = "root_pool/nix/var/nix/builds";
       fsType = "zfs";
     };
 
diff --git a/systems/rhapsody-in-green/hardware.nix b/systems/rhapsody-in-green/hardware.nix
index 277cce4..7ff8fbb 100644
--- a/systems/rhapsody-in-green/hardware.nix
+++ b/systems/rhapsody-in-green/hardware.nix
@@ -40,8 +40,8 @@
       fsType = "zfs";
     };
 
-    "/nix_build" = {
-      device = "root_pool/nix_build";
+    "/nix/var/nix/builds" = {
+      device = "root_pool/nix/var/nix/builds";
       fsType = "zfs";
     };