diff --git a/hosts/desktop/hardware.nix b/hosts/desktop/hardware.nix
index 892aa02..56c6eca 100644
--- a/hosts/desktop/hardware.nix
+++ b/hosts/desktop/hardware.nix
@@ -19,18 +19,18 @@
     };
 
   fileSystems."/nix" =
-    { device = "/dev/disk/by-partlabel/disk-main-ESP";
+    { device = "/dev/disk/by-partlabel/disk-main-nix";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/F529-2C16";
+    { device = "/dev/disk/by-partlabel/disk-main-ESP";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/7edc690b-7e30-49d7-afbe-78354d0f7497";
+    { device = "/dev/disk/by-partlabel/disk-main-home";
       fsType = "ext4";
     };
 
diff --git a/hosts/laptop/hardware.nix b/hosts/laptop/hardware.nix
index 6ae45c2..56c6eca 100644
--- a/hosts/laptop/hardware.nix
+++ b/hosts/laptop/hardware.nix
@@ -14,23 +14,23 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/a843b14e-5e50-408d-9c23-c691c0efe46c";
+    { device = "/dev/disk/by-partlabel/disk-main-root";
       fsType = "ext4";
     };
 
   fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/fbf1f87a-5ed4-42bd-943d-67fae6e6537c";
+    { device = "/dev/disk/by-partlabel/disk-main-nix";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/8BFD-57A2";
+    { device = "/dev/disk/by-partlabel/disk-main-ESP";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/1a3c99c8-5c61-4253-8812-16c5985489f0";
+    { device = "/dev/disk/by-partlabel/disk-main-home";
       fsType = "ext4";
     };