diff --git a/machines/liza/configuration.nix b/machines/liza/configuration.nix
index 7f665eb..eaca23f 100644
--- a/machines/liza/configuration.nix
+++ b/machines/liza/configuration.nix
@@ -7,17 +7,6 @@
 
   # 5synsrjgvfzywruomjsfvfwhhlgxqhyofkzeqt2eisyijvjvebnu2xyd.onion
 
-  firmware.x86_64.enable = true;
-  bios = {
-    enable = true;
-    device = "/dev/sda";
-  };
-
-  luks = {
-    enable = true;
-    device.path = "/dev/disk/by-uuid/2f736fba-8a0c-4fb5-8041-c849fb5e1297";
-  };
-
   system.autoUpgrade.enable = true;
 
   networking.hostName = "liza";
diff --git a/machines/liza/hardware-configuration.nix b/machines/liza/hardware-configuration.nix
index fb784d5..e38f0d9 100644
--- a/machines/liza/hardware-configuration.nix
+++ b/machines/liza/hardware-configuration.nix
@@ -13,6 +13,18 @@
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
+  firmware.x86_64.enable = true;
+
+  bios = {
+    enable = true;
+    device = "/dev/sda";
+  };
+
+  luks = {
+    enable = true;
+    device.path = "/dev/disk/by-uuid/2f736fba-8a0c-4fb5-8041-c849fb5e1297";
+  };
+
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/b90eaf3c-2f91-499a-a066-861e0f4478df";
       fsType = "btrfs";
diff --git a/machines/ponyo/configuration.nix b/machines/ponyo/configuration.nix
index 1a12b50..1ce0d31 100644
--- a/machines/ponyo/configuration.nix
+++ b/machines/ponyo/configuration.nix
@@ -7,17 +7,6 @@
 
   networking.hostName = "ponyo";
 
-  firmware.x86_64.enable = true;
-  bios = {
-    enable = true;
-    device = "/dev/sda";
-  };
-
-  luks = {
-    enable = true;
-    device.path = "/dev/disk/by-uuid/4cc36be4-dbff-4afe-927d-69bf4637bae2";
-  };
-
   system.autoUpgrade.enable = true;
 
   services.zerotierone.enable = true;
diff --git a/machines/ponyo/hardware-configuration.nix b/machines/ponyo/hardware-configuration.nix
index d6f141e..31fb0f7 100644
--- a/machines/ponyo/hardware-configuration.nix
+++ b/machines/ponyo/hardware-configuration.nix
@@ -10,6 +10,18 @@
   boot.kernelModules = [ "kvm-intel" "nvme" ];
   boot.extraModulePackages = [ ];
 
+  firmware.x86_64.enable = true;
+
+  bios = {
+    enable = true;
+    device = "/dev/sda";
+  };
+
+  luks = {
+    enable = true;
+    device.path = "/dev/disk/by-uuid/4cc36be4-dbff-4afe-927d-69bf4637bae2";
+  };
+
   fileSystems."/" =
     { device = "/dev/mapper/enc-pv";
       fsType = "btrfs";