diff --git a/hosts/common/compute-node.nix b/hosts/common/compute-node.nix
index 0930432..c352301 100644
--- a/hosts/common/compute-node.nix
+++ b/hosts/common/compute-node.nix
@@ -6,10 +6,4 @@
     ./user-ppetru.nix
     ./unattended-encryption.nix
   ];
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  networking.networkmanager.enable = true;
 }
diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix
index f496f50..35c363a 100644
--- a/hosts/common/global/default.nix
+++ b/hosts/common/global/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./boot.nix
     ./locale.nix
+    ./network.nix
     ./packages.nix
     ./sudo.nix
   ];
diff --git a/hosts/common/global/network.nix b/hosts/common/global/network.nix
new file mode 100644
index 0000000..f29d881
--- /dev/null
+++ b/hosts/common/global/network.nix
@@ -0,0 +1,3 @@
+{
+  networking.networkmanager.enable = true;
+}