diff --git a/profiles/boot/grub.nix b/profiles/boot/grub.nix
index 84d7a5f..d68cb27 100644
--- a/profiles/boot/grub.nix
+++ b/profiles/boot/grub.nix
@@ -1,15 +1,17 @@
-{ lib, ... }: {
+{ lib, ... }:
+with lib;
+{
   boot.loader = {
     grub = {
-      enable = lib.mkDefault true;
-      device = "nodev";
-      efiSupport = true;
-      useOSProber = true;
-      efiInstallAsRemovable = lib.mkDefault true;
+      enable = mkDefault true;
+      device = mkDefault "nodev";
+      efiSupport = mkDefault true;
+      useOSProber = mkDefault false;
+      efiInstallAsRemovable = mkDefault true;
     };
     efi = {
-      canTouchEfiVariables = lib.mkDefault false;
-      efiSysMountPoint = "/boot/efi";
+      canTouchEfiVariables = mkDefault false;
+      efiSysMountPoint = mkDefault "/boot/efi";
     };
   };
 }
diff --git a/profiles/boot/systemd-boot.nix b/profiles/boot/systemd-boot.nix
index 91f9535..4a8d189 100644
--- a/profiles/boot/systemd-boot.nix
+++ b/profiles/boot/systemd-boot.nix
@@ -1,12 +1,14 @@
-{ lib, ... }: {
+{ lib, ... }:
+with lib;
+{
   boot.loader = {
     systemd-boot = {
-      enable = lib.mkDefault true;
+      enable = mkDefault true;
       editor = false;
       consoleMode = "2";
     };
 
     efi.canTouchEfiVariables = true;
-    timeout = lib.mkDefault 3;
+    timeout = mkDefault 3;
   };
 }