diff --git a/flake.nix b/flake.nix
index 879a999..73e25c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,7 +41,7 @@
       };
       mkComputer = configurationNix: homeManagerRole: extraModules: nixpkgs.lib.nixosSystem {
         inherit system pkgs;
-        specialArgs = { inherit system inputs; };
+        specialArgs = { inherit self system inputs; };
         modules = (
           [
             # System configuration for this host
@@ -54,7 +54,9 @@
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.users.${username}.imports = [ homeManagerRole ];
+              home-manager.users.${username}.imports = [
+                (import homeManagerRole { inherit self pkgs; })
+              ];
             }
           ] ++ extraModules
         );
diff --git a/home-manager/common/default.nix b/home-manager/common/default.nix
index 502ee41..102c5e4 100644
--- a/home-manager/common/default.nix
+++ b/home-manager/common/default.nix
@@ -1,6 +1,6 @@
-{ ... }:
+{ self, ... }:
 let
-  username = import ../../username.nix;
+  username = import "${self}/username.nix";
 in
 {
   # Home Manager needs a bit of information about you and the
diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index 10db4b2..427e03f 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ self, pkgs, ... }:
 {
   imports = [
-    ./common
+    (import ./common { inherit self; })
     ./software/work-desktop
     ./software/autorandr
     ./software/czkawka
diff --git a/modules/code-server/default.nix b/modules/code-server/default.nix
index 48e0e2f..f513453 100644
--- a/modules/code-server/default.nix
+++ b/modules/code-server/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ self, pkgs, ... }:
 let
-  username = import ../../username.nix;
+  username = import "${self}/username.nix";
 in
 {
   services.code-server = {
diff --git a/modules/common/default.nix b/modules/common/default.nix
index 9f58809..542b634 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ self, pkgs, ... }:
 let
-  username = import ../../username.nix;
+  username = import "${self}/username.nix";
 in
 {
   imports = [
@@ -35,7 +35,7 @@ in
 
   programs.mosh.enable = true;
   services = {
-    openssh = { 
+    openssh = {
       enable = true;
       permitRootLogin = "no";
     };
diff --git a/modules/docker/default.nix b/modules/docker/default.nix
index df2a30a..fd1aebe 100644
--- a/modules/docker/default.nix
+++ b/modules/docker/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ self, pkgs, ... }:
 let
-  username = import ../../username.nix;
+  username = import "${self}/username.nix";
 in
 {
   virtualisation.docker =
diff --git a/modules/droidcam/default.nix b/modules/droidcam/default.nix
index 96b115e..50ef807 100644
--- a/modules/droidcam/default.nix
+++ b/modules/droidcam/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ self, pkgs, ... }:
 let
-  username = import ../../username.nix;
+  username = import "${self}/username.nix";
 in
 {
   programs.droidcam.enable = true;
diff --git a/modules/eog/default.nix b/modules/eog/default.nix
index 1e02333..c73c40e 100644
--- a/modules/eog/default.nix
+++ b/modules/eog/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ self, pkgs, ... }:
 let
-  username = import ../../username.nix;
+  username = import "${self}/username.nix";
 in
 {
   environment.systemPackages = with pkgs; [
diff --git a/modules/espanso/default.nix b/modules/espanso/default.nix
index f43a672..ed4c1a9 100644
--- a/modules/espanso/default.nix
+++ b/modules/espanso/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ self, pkgs, ... }:
 let
-  username = import ../../username.nix;
+  username = import "${self}/username.nix";
 in
 {
   services.espanso.enable = true;
diff --git a/modules/nix-direnv/default.nix b/modules/nix-direnv/default.nix
index 7d051b0..e241b5a 100644
--- a/modules/nix-direnv/default.nix
+++ b/modules/nix-direnv/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ self, pkgs, ... }:
 let
-  username = import ../../username.nix;
+  username = import "${self}/username.nix";
 in
 {
   nix.extraOptions = ''
diff --git a/modules/restic/default.nix b/modules/restic/default.nix
index b585105..8208ef9 100644
--- a/modules/restic/default.nix
+++ b/modules/restic/default.nix
@@ -1,6 +1,6 @@
-{ ... }:
+{ self, ... }:
 let
-  username = import ../../username.nix;
+  username = import "${self}/username.nix";
 in
 {
   services.restic.backups.${username} = {
diff --git a/modules/steam/default.nix b/modules/steam/default.nix
index ebae663..ac114c2 100644
--- a/modules/steam/default.nix
+++ b/modules/steam/default.nix
@@ -1,6 +1,6 @@
-{ ... }:
+{ self, ... }:
 let
-  username = import ../../username.nix;
+  username = import "${self}/username.nix";
 in
 {
   programs.steam.enable = true;
diff --git a/modules/xonsh/default.nix b/modules/xonsh/default.nix
index d94d006..41831b1 100644
--- a/modules/xonsh/default.nix
+++ b/modules/xonsh/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ self, pkgs, ... }:
 let
-  username = import ../../username.nix;
+  username = import "${self}/username.nix";
 in
 {
   programs.xonsh = {