diff --git a/hosts/focalor/default.nix b/hosts/focalor/default.nix
index 99c93d6..2958a4a 100644
--- a/hosts/focalor/default.nix
+++ b/hosts/focalor/default.nix
@@ -11,6 +11,7 @@
     ../../modules/common/system.nix
     ../../modules/common/users.nix
     ../../modules/common/services.nix
+    ../../modules/common/efi.nix
 
     # Desktop modules
     ../../modules/desktop/core.nix
diff --git a/hosts/valefar/default.nix b/hosts/valefar/default.nix
index ba90e87..4d2fd57 100644
--- a/hosts/valefar/default.nix
+++ b/hosts/valefar/default.nix
@@ -11,6 +11,7 @@
     ../../modules/common/system.nix
     ../../modules/common/users.nix
     ../../modules/common/services.nix
+    ../../modules/common/efi.nix
     
     # Services specific to this host
     ../../services/garage.nix
diff --git a/modules/common/efi.nix b/modules/common/efi.nix
new file mode 100644
index 0000000..bc9f6ae
--- /dev/null
+++ b/modules/common/efi.nix
@@ -0,0 +1,7 @@
+{ pkgs, config, ... }:
+{
+  boot.loader.systemd-boot.enable     = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  fileSystems."/boot".options = [ "umask=0077" ];
+}
+
diff --git a/modules/common/system.nix b/modules/common/system.nix
index ac77898..1d33591 100644
--- a/modules/common/system.nix
+++ b/modules/common/system.nix
@@ -3,10 +3,7 @@
   nixpkgs.config.allowUnfree = true; #because im a gigachad 
 
   # boot, networking, locale, stateVersion
-  boot.loader.systemd-boot.enable     = true;
-  boot.loader.efi.canTouchEfiVariables = true;
   boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
-  fileSystems."/boot".options = [ "umask=0077" ];
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];