diff --git a/common/boot.nix b/common/boot.nix
new file mode 100644
index 0000000..10315dc
--- /dev/null
+++ b/common/boot.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+
+{
+  boot.loader = {
+    systemd-boot.enable = true;
+    systemd-boot.editor = false;
+    systemd-boot.memtest86.enable = true;
+    efi.canTouchEfiVariables = true;
+  };
+}
diff --git a/common/default.nix b/common/default.nix
index a1f43a4..ba0a48b 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -3,6 +3,7 @@
     ./base-graphical
     ./base-server
     ./users
+    ./boot.nix
     ./environment.nix
     ./home-manager.nix
     ./nginx.nix
diff --git a/hosts/kalessin/default.nix b/hosts/kalessin/default.nix
index aeb39a6..7047dff 100644
--- a/hosts/kalessin/default.nix
+++ b/hosts/kalessin/default.nix
@@ -8,9 +8,6 @@
   networking.hostName = "kalessin";
   networking.hostId = "534b538e";
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   users.users.qenya.extraGroups = [ "wheel" ];
   qenya.base-server.enable = true;
 
diff --git a/hosts/kilgharrah/boot.nix b/hosts/kilgharrah/boot.nix
deleted file mode 100644
index 31d92d8..0000000
--- a/hosts/kilgharrah/boot.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  boot = {
-    loader.systemd-boot.enable = true;
-    loader.systemd-boot.editor = false;
-    loader.efi.canTouchEfiVariables = true;
-
-    initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
-    kernelModules = [ "kvm-intel" ];
-
-    supportedFilesystems = [ "ntfs" ]; # for USB drives
-  };
-}
diff --git a/hosts/kilgharrah/datasets.nix b/hosts/kilgharrah/datasets.nix
deleted file mode 100644
index 161a50f..0000000
--- a/hosts/kilgharrah/datasets.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.etc.crypttab.text = ''
-    albion UUID=acda0e7a-069f-47c7-8e37-ec00e7cdde0f /root/luks-albion.key
-  '';
-
-  randomcat.services.zfs.datasets = {
-    "rpool_albion/data" = { mountpoint = "none"; };
-    "rpool_albion/data/steam" = { mountpoint = "/home/qenya/.local/share/Steam"; };
-  };
-}
diff --git a/hosts/kilgharrah/default.nix b/hosts/kilgharrah/default.nix
index 848539e..e9bc21d 100644
--- a/hosts/kilgharrah/default.nix
+++ b/hosts/kilgharrah/default.nix
@@ -2,12 +2,9 @@
 
 {
   imports = [
-    ./boot.nix
     ./filesystems.nix
     ./hardware.nix
     ./networking.nix
-
-    ./datasets.nix
     ./ftp.nix
   ];
 
@@ -15,6 +12,9 @@
   networking.hostName = "kilgharrah";
   networking.hostId = "72885bb5";
 
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.kernelModules = [ "kvm-intel" ];
+
   qenya.base-graphical.enable = true;
   qenya.base-graphical.desktop = "plasma6";
 
@@ -47,6 +47,11 @@
 
   programs.steam.enable = true;
 
+  randomcat.services.zfs.datasets = {
+    "rpool_albion/data" = { mountpoint = "none"; };
+    "rpool_albion/data/steam" = { mountpoint = "/home/qenya/.local/share/Steam"; };
+  };
+
   system.stateVersion = "24.05";
 
 }
diff --git a/hosts/kilgharrah/filesystems.nix b/hosts/kilgharrah/filesystems.nix
index e2baa43..a1d990c 100644
--- a/hosts/kilgharrah/filesystems.nix
+++ b/hosts/kilgharrah/filesystems.nix
@@ -5,6 +5,12 @@
     "cryptroot".device = "/dev/disk/by-uuid/b414aaba-0a36-4135-a7e1-dc9489286acd";
   };
 
+  environment.etc.crypttab.text = ''
+    albion UUID=acda0e7a-069f-47c7-8e37-ec00e7cdde0f /root/luks-albion.key
+  '';
+
+  boot.supportedFilesystems = [ "ntfs" ]; # for USB drives
+
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-uuid/ad4cbc18-8849-40ed-b0bf-097f8f46346b";
diff --git a/hosts/orm/default.nix b/hosts/orm/default.nix
index e70bf1c..e8e32ef 100644
--- a/hosts/orm/default.nix
+++ b/hosts/orm/default.nix
@@ -8,9 +8,6 @@
   networking.hostName = "orm";
   networking.hostId = "00000000";
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   users.users.qenya.extraGroups = [ "wheel" ];
   qenya.base-server.enable = true;
 
diff --git a/hosts/tohru/boot.nix b/hosts/tohru/boot.nix
deleted file mode 100644
index 5f9d144..0000000
--- a/hosts/tohru/boot.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  boot = {
-    loader.systemd-boot.enable = true;
-    loader.systemd-boot.editor = false;
-    loader.efi.canTouchEfiVariables = true;
-
-    initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" ];
-    kernelModules = [ "kvm-intel" ];
-
-    supportedFilesystems = [ "ntfs" ]; # for USB drives
-  };
-}
diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix
index c5b1fef..2a183f5 100644
--- a/hosts/tohru/default.nix
+++ b/hosts/tohru/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ./boot.nix
     ./filesystems.nix
     ./hardware.nix
     ./networking.nix
@@ -14,6 +13,9 @@
   networking.hostName = "tohru";
   networking.hostId = "31da19c1";
 
+  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" ];
+  boot.kernelModules = [ "kvm-intel" ];
+
   qenya.base-graphical.enable = true;
 
   time.timeZone = "Europe/London";
diff --git a/hosts/tohru/filesystems.nix b/hosts/tohru/filesystems.nix
index e60965e..6975fe6 100644
--- a/hosts/tohru/filesystems.nix
+++ b/hosts/tohru/filesystems.nix
@@ -5,6 +5,8 @@
     "rpool".device = "/dev/nvme0n1p2";
   };
 
+  boot.supportedFilesystems = [ "ntfs" ]; # for USB drives
+
   fileSystems = {
     "/" = {
       device = "rpool/root";
diff --git a/hosts/yevaud/default.nix b/hosts/yevaud/default.nix
index d18de9a..85870d7 100644
--- a/hosts/yevaud/default.nix
+++ b/hosts/yevaud/default.nix
@@ -8,9 +8,6 @@
   networking.hostName = "yevaud";
   networking.hostId = "09673d65";
 
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   users.users.qenya.extraGroups = [ "wheel" ];
 
   qenya.base-server.enable = true;