diff --git a/m/bay/configuration.nix b/m/bay/configuration.nix
index 5f215cf1..5c6f93ca 100644
--- a/m/bay/configuration.nix
+++ b/m/bay/configuration.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../common/xeon.nix
+    ../common/ssf.nix
     ../module/monitoring.nix
   ];
 
diff --git a/m/common/ssf.nix b/m/common/ssf.nix
new file mode 100644
index 00000000..a01839b3
--- /dev/null
+++ b/m/common/ssf.nix
@@ -0,0 +1,9 @@
+{
+  # Provides the base system for a xeon node in the SSF rack.
+  imports = [
+    ./xeon.nix
+    ./ssf/fs.nix
+    ./ssf/net.nix
+    ./ssf/ssh.nix
+  ];
+}
diff --git a/m/common/xeon/fs.nix b/m/common/ssf/fs.nix
similarity index 100%
rename from m/common/xeon/fs.nix
rename to m/common/ssf/fs.nix
diff --git a/m/common/xeon/net.nix b/m/common/ssf/net.nix
similarity index 100%
rename from m/common/xeon/net.nix
rename to m/common/ssf/net.nix
diff --git a/m/common/xeon/ssh.nix b/m/common/ssf/ssh.nix
similarity index 100%
rename from m/common/xeon/ssh.nix
rename to m/common/ssf/ssh.nix
diff --git a/m/common/xeon.nix b/m/common/xeon.nix
index 146e018c..13946609 100644
--- a/m/common/xeon.nix
+++ b/m/common/xeon.nix
@@ -1,10 +1,7 @@
 {
-  # Provides the base system for a xeon node.
+  # Provides the base system for a xeon node, not necessarily in the SSF rack.
   imports = [
     ./base.nix
     ./xeon/console.nix
-    ./xeon/fs.nix
-    ./xeon/net.nix
-    ./xeon/ssh.nix
   ];
 }
diff --git a/m/eudy/configuration.nix b/m/eudy/configuration.nix
index 29d495a8..d6761354 100644
--- a/m/eudy/configuration.nix
+++ b/m/eudy/configuration.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../common/xeon.nix
+    ../common/ssf.nix
     #(modulesPath + "/installer/netboot/netboot-minimal.nix")
 
     ./kernel/kernel.nix
diff --git a/m/hut/configuration.nix b/m/hut/configuration.nix
index b00351de..493208c4 100644
--- a/m/hut/configuration.nix
+++ b/m/hut/configuration.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../common/xeon.nix
+    ../common/ssf.nix
 
     ../module/ceph.nix
     ../module/debuginfod.nix
diff --git a/m/koro/configuration.nix b/m/koro/configuration.nix
index 4214fee1..a106b628 100644
--- a/m/koro/configuration.nix
+++ b/m/koro/configuration.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../common/xeon.nix
+    ../common/ssf.nix
     #(modulesPath + "/installer/netboot/netboot-minimal.nix")
 
     ../eudy/cpufreq.nix
diff --git a/m/lake2/configuration.nix b/m/lake2/configuration.nix
index 2a29ae7a..e2f350df 100644
--- a/m/lake2/configuration.nix
+++ b/m/lake2/configuration.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../common/xeon.nix
+    ../common/ssf.nix
     ../module/monitoring.nix
   ];
 
diff --git a/m/owl1/configuration.nix b/m/owl1/configuration.nix
index 20e3cf57..e471969d 100644
--- a/m/owl1/configuration.nix
+++ b/m/owl1/configuration.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../common/xeon.nix
+    ../common/ssf.nix
     ../module/ceph.nix
     ../module/emulation.nix
     ../module/slurm-client.nix
diff --git a/m/owl2/configuration.nix b/m/owl2/configuration.nix
index 54849f6a..e28c5e52 100644
--- a/m/owl2/configuration.nix
+++ b/m/owl2/configuration.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../common/xeon.nix
+    ../common/ssf.nix
     ../module/ceph.nix
     ../module/emulation.nix
     ../module/slurm-client.nix