diff --git a/machines/kholinar/default.nix b/machines/kholinar/default.nix
index 60b051f1..1e201172 100644
--- a/machines/kholinar/default.nix
+++ b/machines/kholinar/default.nix
@@ -11,14 +11,6 @@
     ../../profiles/graphical/default.nix
   ];
 
-  # Use the systemd-boot EFI boot loader.
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-  };
-
   networking = {
     hostId = "3cc1a4b2";
     hostName = "kholinar";
diff --git a/machines/kholinar/hardware.nix b/machines/kholinar/hardware.nix
index e7b8d24d..5780974d 100644
--- a/machines/kholinar/hardware.nix
+++ b/machines/kholinar/hardware.nix
@@ -1,15 +1,21 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ "i915" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    # Use the systemd-boot EFI boot loader.
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
+      kernelModules = ["i915"];
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
 
   fileSystems."/" = {
     device = "rpool/local/root";
diff --git a/machines/oldtown/default.nix b/machines/oldtown/default.nix
index 97f77fa3..483a670d 100644
--- a/machines/oldtown/default.nix
+++ b/machines/oldtown/default.nix
@@ -11,11 +11,6 @@
     ../../profiles/graphical/default.nix
   ];
 
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = true;
-  };
-
   networking.hostName = "oldtown";
 
   time.timeZone = "Europe/Brussels";
diff --git a/machines/oldtown/hardware.nix b/machines/oldtown/hardware.nix
index 837eb1a8..05c3a5a7 100644
--- a/machines/oldtown/hardware.nix
+++ b/machines/oldtown/hardware.nix
@@ -3,10 +3,18 @@
 {
   imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
-  boot.initrd.kernelModules = [ "i915" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    initrd = {
+      availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+      kernelModules = [ "i915" ];
+    };
+    kernelModules = [ "kvm-intel" ];
+    extraModulePackages = [ ];
+  };
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/e4b7eae2-546d-412b-9258-389315f4b835";