diff --git a/fschl/systems/base.scm b/fschl/systems/base.scm
index 82cd4b3..ff08ced 100644
--- a/fschl/systems/base.scm
+++ b/fschl/systems/base.scm
@@ -34,14 +34,10 @@
 
    ;; Use the UEFI variant of GRUB with the EFI System
    ;; Partition mounted on /boot/efi.
-  (bootloader (bootloader-configuration
-                (bootloader grub-bootloader)
-                (targets (list "/dev/nvme0n1p1"))
+   (bootloader (bootloader-configuration
+                (bootloader grub-efi-bootloader)
+                (targets '("/boot/efi"))
                 (keyboard-layout keyboard-layout)))
-;;   (bootloader (bootloader-configuration
-;;                (bootloader grub-efi-bootloader)
-;;                (targets '("/boot/efi"))
-;;                (keyboard-layout keyboard-layout)))
 
    ;; Guix doesn't like it when there isn't a file-systems
    ;; entry, so add one that is meant to be overridden
@@ -51,11 +47,6 @@
                    (device "none")
                    (type "tmpfs")
                    (check? #f))
-
-                  (file-system
-                   (device "/dev/nvme0n1p3")
-                   (mount-point "/")
-                   (type "ext4"))
                   %base-file-systems))
 
    (users (cons (user-account