diff --git a/nixos/desktop.nix b/nixos/desktop.nix
index 0308adcf..2f491e8b 100644
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@@ -19,6 +19,7 @@
 
     # Hardware
     ./hardware/machines/desktop.nix
+    ./hardware/systemdboot.nix
     ./hardware/nvidia.nix
     ./hardware/opengl.nix
 
diff --git a/nixos/hardware/machines/desktop.nix b/nixos/hardware/machines/desktop.nix
index efc18630..75c45451 100644
--- a/nixos/hardware/machines/desktop.nix
+++ b/nixos/hardware/machines/desktop.nix
@@ -66,12 +66,6 @@ in {
     extraModprobeConfig = ''
       options hid_apple fnmode=2
     '';
-
-    # Use the Systemd-Boot bootloader
-    loader.systemd-boot = {
-      enable = true;
-      netbootxyz.enable = true;
-    };
   };
 
   # Additional entry to boot from the second GPU
diff --git a/nixos/hardware/machines/server.nix b/nixos/hardware/machines/server.nix
index 24a0dd43..a3c2fc48 100644
--- a/nixos/hardware/machines/server.nix
+++ b/nixos/hardware/machines/server.nix
@@ -22,12 +22,6 @@
         "kvm-intel"
       ];
     };
-
-    # Use the Systemd-Boot bootloader
-    loader.systemd-boot = {
-      enable = true;
-      netbootxyz.enable = true;
-    };
   };
 
   # Mounting options
diff --git a/nixos/hardware/systemdboot.nix b/nixos/hardware/systemdboot.nix
new file mode 100644
index 00000000..8bdedc70
--- /dev/null
+++ b/nixos/hardware/systemdboot.nix
@@ -0,0 +1,7 @@
+{
+  # For UEFI Machines
+  boot.loader.systemd-boot = {
+    enable = true;
+    netbootxyz.enable = true;
+  };
+}
diff --git a/nixos/server.nix b/nixos/server.nix
index 4d550974..d8760753 100644
--- a/nixos/server.nix
+++ b/nixos/server.nix
@@ -13,6 +13,7 @@
 
     # Hardware
     ./hardware/machines/server.nix
+    ./hardware/systemdboot.nix
 
     # Services
     ./services/openssh.nix