diff --git a/config.scm b/config.scm
index f48b6f0..6499846 100644
--- a/config.scm
+++ b/config.scm
@@ -43,14 +43,12 @@
  (file-systems
   (cons*
    (file-system
-    (device (uuid
-             (read-partition-uuid
-              (find-partition-by-label "EFI System Partition"))))
+    (device (file-system-label "EFI\\x20System\\x20Partition"))
     #;(device "/dev/disk/by-partlabel/EFI\\x20System\\x20Partition")
     (mount-point "/boot/efi")
     (type "vfat"))
    (file-system
-    (device (find-partition-by-label "guix-root"))
+    (device (file-system-label "guix-root"))
     #;(device "/dev/disk/by-partlabel/guix-root")
     (mount-point "/")
     (type "xfs"))
@@ -58,7 +56,7 @@
  (swap-devices
   (list
    (swap-space
-    (target (find-partition-by-label "swap"))
+    (target (file-system-label "swap"))
     #;(target "/dev/disk/by-partlabel/swap")
     (discard? #t))))
  (users