diff --git a/common/boot.nix b/common/boot.nix
new file mode 100644
index 0000000..718d776
--- /dev/null
+++ b/common/boot.nix
@@ -0,0 +1,12 @@
+{lib,...}:
+{
+	boot.loader = {
+		timeout = lib.mkDefault 0;
+		efi.canTouchEfiVariables = true;
+		systemd-boot = {
+			enable = true;
+			editor = false;
+			configurationLimit = 100;
+		};
+	};
+}
diff --git a/common/default.nix b/common/default.nix
new file mode 100644
index 0000000..8adc809
--- /dev/null
+++ b/common/default.nix
@@ -0,0 +1,7 @@
+{...}:
+{
+	imports = [
+		./locale.nix
+		./boot.nix
+	];
+}
diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 46a19d0..229ced6 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -12,7 +12,7 @@
       ../../modules/websites
       ../../modules/plasma
 
-			../../common/locale.nix
+			../../common
     ];
 
   boot = rec {
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index ba8a4dd..6614ebe 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -14,13 +14,9 @@
       (modulesPath + "/installer/scan/not-detected.nix")
       (modulesPath + "/profiles/qemu-guest.nix")
 
-			../../common/locale.nix
+			../../common
     ];
 
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
   # LOVE me some blob
   hardware.enableRedistributableFirmware = true;
   hardware.enableAllFirmware = true;