diff --git a/systems/bob/default.nix b/systems/bob/default.nix
index 9dc6c69..c3953d8 100644
--- a/systems/bob/default.nix
+++ b/systems/bob/default.nix
@@ -1,18 +1,19 @@
+{ self, ... }:
 {
   imports = [
-    ../../users/richie
-    ../../users/gaming
-    ../../common/global
-    ../../common/optional/desktop.nix
-    ../../common/optional/docker.nix
-    ../../common/optional/scanner.nix
-    ../../common/optional/steam.nix
-    ../../common/optional/syncthing_base.nix
-    ../../common/optional/systemd-boot.nix
-    ../../common/optional/update.nix
-    ../../common/optional/yubikey.nix
-    ../../common/optional/zerotier.nix
-    ../../common/optional/nvidia.nix
+    "${self}/users/richie"
+    "${self}/users/gaming"
+    "${self}/common/global"
+    "${self}/common/optional/desktop.nix"
+    "${self}/common/optional/docker.nix"
+    "${self}/common/optional/scanner.nix"
+    "${self}/common/optional/steam.nix"
+    "${self}/common/optional/syncthing_base.nix"
+    "${self}/common/optional/systemd-boot.nix"
+    "${self}/common/optional/update.nix"
+    "${self}/common/optional/yubikey.nix"
+    "${self}/common/optional/zerotier.nix"
+    "${self}/common/optional/nvidia.nix"
     ./hardware.nix
     ./syncthing.nix
     ./llms.nix
diff --git a/systems/brain/default.nix b/systems/brain/default.nix
index e3d7376..4139c92 100644
--- a/systems/brain/default.nix
+++ b/systems/brain/default.nix
@@ -1,14 +1,14 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 {
   imports = [
-    ../../users/richie
-    ../../common/global
-    ../../common/optional/docker.nix
-    ../../common/optional/ssh_decrypt.nix
-    ../../common/optional/syncthing_base.nix
-    ../../common/optional/systemd-boot.nix
-    ../../common/optional/update.nix
-    ../../common/optional/zerotier.nix
+    "${self}/users/richie"
+    "${self}/common/global"
+    "${self}/common/optional/docker.nix"
+    "${self}/common/optional/ssh_decrypt.nix"
+    "${self}/common/optional/syncthing_base.nix"
+    "${self}/common/optional/systemd-boot.nix"
+    "${self}/common/optional/update.nix"
+    "${self}/common/optional/zerotier.nix"
     ./docker
     ./hardware.nix
     ./programs.nix
diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix
index 4780252..c5352a1 100644
--- a/systems/jeeves/default.nix
+++ b/systems/jeeves/default.nix
@@ -1,17 +1,18 @@
+{ self, ... }:
 let
   vars = import ./vars.nix;
 in
 {
   imports = [
-    ../../users/richie
-    ../../users/math
-    ../../users/dov
-    ../../common/global
-    ../../common/optional/docker.nix
-    ../../common/optional/ssh_decrypt.nix
-    ../../common/optional/syncthing_base.nix
-    ../../common/optional/update.nix
-    ../../common/optional/zerotier.nix
+    "${self}/users/richie"
+    "${self}/users/math"
+    "${self}/users/dov"
+    "${self}/common/global"
+    "${self}/common/optional/docker.nix"
+    "${self}/common/optional/ssh_decrypt.nix"
+    "${self}/common/optional/syncthing_base.nix"
+    "${self}/common/optional/update.nix"
+    "${self}/common/optional/zerotier.nix"
     ./docker
     ./services
     ./hardware.nix
diff --git a/systems/leviathan/default.nix b/systems/leviathan/default.nix
index 2361dc3..52a64c8 100644
--- a/systems/leviathan/default.nix
+++ b/systems/leviathan/default.nix
@@ -1,14 +1,14 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 {
   imports = [
-    ../../users/elise
-    ../../users/richie
-    ../../common/global
-    ../../common/optional/desktop.nix
-    ../../common/optional/steam.nix
-    ../../common/optional/systemd-boot.nix
-    ../../common/optional/update.nix
-    ../../common/optional/zerotier.nix
+    "${self}/users/elise"
+    "${self}/users/richie"
+    "${self}/common/global"
+    "${self}/common/optional/desktop.nix"
+    "${self}/common/optional/steam.nix"
+    "${self}/common/optional/systemd-boot.nix"
+    "${self}/common/optional/update.nix"
+    "${self}/common/optional/zerotier.nix"
     ./hardware.nix
     inputs.nixos-hardware.nixosModules.framework-13-7040-amd
   ];
diff --git a/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix
index 459b481..030bd95 100644
--- a/systems/rhapsody-in-green/default.nix
+++ b/systems/rhapsody-in-green/default.nix
@@ -1,15 +1,15 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 {
   imports = [
-    ../../users/richie
-    ../../common/global
-    ../../common/optional/desktop.nix
-    ../../common/optional/docker.nix
-    ../../common/optional/steam.nix
-    ../../common/optional/syncthing_base.nix
-    ../../common/optional/systemd-boot.nix
-    ../../common/optional/yubikey.nix
-    ../../common/optional/zerotier.nix
+    "${self}/users/richie"
+    "${self}/common/global"
+    "${self}/common/optional/desktop.nix"
+    "${self}/common/optional/docker.nix"
+    "${self}/common/optional/steam.nix"
+    "${self}/common/optional/syncthing_base.nix"
+    "${self}/common/optional/systemd-boot.nix"
+    "${self}/common/optional/yubikey.nix"
+    "${self}/common/optional/zerotier.nix"
     ./hardware.nix
     ./llms.nix
     ./syncthing.nix