diff --git a/common/base-node.nix b/common/base-node.nix
new file mode 100644
index 0000000..a6e1125
--- /dev/null
+++ b/common/base-node.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ./cifs-client.nix
+    ./consul.nix
+    ./glusterfs-client.nix
+    ./impermanence.nix
+    ./sshd.nix
+    ./user-ppetru.nix
+    ./unattended-encryption.nix
+    ./systemd-boot.nix
+  ];
+}
diff --git a/common/compute-node.nix b/common/compute-node.nix
index 81b1638..4b8fb18 100644
--- a/common/compute-node.nix
+++ b/common/compute-node.nix
@@ -1,16 +1,9 @@
 { pkgs, ... }:
 {
   imports = [
-    ./cifs-client.nix
-    ./consul.nix
+    ./base-node.nix
     ./glusterfs.nix
-    ./glusterfs-client.nix
-    ./impermanence.nix
     ./nomad.nix
-    ./sshd.nix
-    ./user-ppetru.nix
-    ./unattended-encryption.nix
     ./syncthing-data.nix
-    ./systemd-boot.nix
   ];
 }
diff --git a/hosts/chilly/default.nix b/hosts/chilly/default.nix
index 82bbb18..afd1049 100644
--- a/hosts/chilly/default.nix
+++ b/hosts/chilly/default.nix
@@ -2,7 +2,7 @@
 {
   imports = [
     ../../common/global
-    ../../common/compute-node.nix
+    ../../common/base-node.nix
     ./disk-config.nix
     ./hardware.nix
   ];