diff --git a/hosts/orm/hardware-configuration.nix b/hosts/orm/hardware-configuration.nix
index e13d4e6..11459e7 100644
--- a/hosts/orm/hardware-configuration.nix
+++ b/hosts/orm/hardware-configuration.nix
@@ -10,7 +10,7 @@
 
   boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
@@ -34,6 +34,10 @@
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/a0ac8f60-25f9-4dec-af70-e3f4cd36c575"; }
+    ];
+
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction
diff --git a/hosts/tohru/hardware-configuration.nix b/hosts/tohru/hardware-configuration.nix
index 9f80893..71a4dee 100644
--- a/hosts/tohru/hardware-configuration.nix
+++ b/hosts/tohru/hardware-configuration.nix
@@ -33,20 +33,19 @@
       fsType = "zfs";
     };
 
-  fileSystems."/data" =
-    { device = "rpool/data";
-      fsType = "zfs";
-    };
-
   fileSystems."/home" =
     { device = "rpool/home";
       fsType = "zfs";
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/7DD4-487E";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
+  fileSystems."/data" =
+    { device = "rpool/data";
+      fsType = "zfs";
+    };
+
+  fileSystems."/data/syncthing" =
+    { device = "rpool/data/syncthing";
+      fsType = "zfs";
     };
 
   fileSystems."/data/steam" =
@@ -54,9 +53,10 @@
       fsType = "zfs";
     };
 
-  fileSystems."/data/syncthing" =
-    { device = "rpool/data/syncthing";
-      fsType = "zfs";
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/7DD4-487E";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices =
diff --git a/hosts/yevaud/hardware-configuration.nix b/hosts/yevaud/hardware-configuration.nix
index c11d3fc..aa624a3 100644
--- a/hosts/yevaud/hardware-configuration.nix
+++ b/hosts/yevaud/hardware-configuration.nix
@@ -28,17 +28,17 @@
       fsType = "zfs";
     };
 
+  fileSystems."/data/forgejo" =
+    { device = "rpool/forgejo";
+      fsType = "zfs";
+    };
+
   fileSystems."/boot" =
     { device = "/dev/disk/by-uuid/107D-5AB3";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  fileSystems."/data/forgejo" =
-    { device = "rpool/forgejo";
-      fsType = "zfs";
-    };
-
   swapDevices =
     [ { device = "/dev/disk/by-uuid/f8b6eb35-33ad-4e19-bf3d-cac5ec38a8dc"; }
     ];