diff --git a/config.scm b/config.scm
index 6fad241..e6b2a1d 100644
--- a/config.scm
+++ b/config.scm
@@ -44,24 +44,18 @@
  (file-systems
   (cons*
    (file-system
-    (device
-     (find-partition-by-label "EFI System Partition"))
-    #;(device "/dev/disk/by-partlabel/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 "/dev/disk/by-partlabel/guix-root")
+    (device "/dev/disk/by-partlabel/guix-root")
     (mount-point "/")
     (type "xfs"))
    %base-file-systems))
  (swap-devices
   (list
    (swap-space
-    (target
-     (find-partition-by-label "swap"))
-    #;(target "/dev/disk/by-partlabel/swap")
+    (target "/dev/disk/by-partlabel/swap")
     (discard? #t))))
  (users
   (cons*