diff --git a/flake.nix b/flake.nix
index 7d94506..d455a4e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,8 +35,8 @@
     }:
     let
       custom = import ./custom;
-      mkComputer = import "${self}/lib/mk_computer.nix";
-      mkRaspi = import "${self}/lib/mk_raspi.nix";
+      mkComputer = import "${inputs.self}/lib/mk_computer.nix";
+      mkRaspi = import "${inputs.self}/lib/mk_raspi.nix";
 
       system = custom.system;
       username = custom.username;
@@ -64,72 +64,72 @@
         gwyn = mkComputer {
           hostname = "gwyn";
           home-module = "desktop";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         nixos-vm = mkComputer {
           hostname = "desktop-vm";
           home-module = "desktop";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         staubfinger = mkComputer {
           hostname = "staubfinger";
           home-module = "desktop";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         # Servers
         git = mkComputer {
           hostname = "git";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         jdownloader = mkComputer {
           hostname = "jdownloader";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         mail = mkComputer {
           hostname = "mail";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         nextcloud = mkComputer {
           hostname = "nextcloud";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         nixos-management = mkComputer {
           hostname = "nixos-management";
           home-module = "management";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         pihole = mkComputer {
           hostname = "pihole";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         plex = mkComputer {
           hostname = "plex";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         proxy = mkComputer {
           hostname = "proxy";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         raspi-test = mkRaspi {
           hostname = "raspi-test";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         restic-server = mkComputer {
           hostname = "restic-server";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         test-server = mkComputer {
           hostname = "test-server";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
         ttrss = mkComputer {
           hostname = "ttrss";
-          inherit custom pkgs inputs self;
+          inherit custom pkgs inputs;
         };
       };
       homeConfigurations = {
         "${custom.username}@co-ws-con4" = home-manager.lib.homeManagerConfiguration {
-          configuration = import ./home-manager/work-wsl.nix;
+          configuration = import "${inputs.self}/home-manager/work-wsl.nix";
           inherit system username;
           homeDirectory = "/home/${custom.username}";
           extraSpecialArgs = {
diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index 90c6a5f..fe30128 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -1,31 +1,31 @@
 { inputs, custom, pkgs, ... }:
 {
   imports = [
-    ./software/ansible
-    (import ./common { inherit custom inputs; })
-    ./software/calibre
-    ./software/czkawka
-    ./software/dunst
-    (import ./software/emacs { inherit custom pkgs; })
-    ./software/email
-    ./software/evince
-    ./software/fzf
-    ./software/git
-    ./software/grobi
-    ./software/keeweb
-    ./software/libimobiledevice
-    ./software/mime-apps
-    ./software/mpv
-    ./software/nitrogen
-    ./software/obsidian
-    ./software/pycharm
-    ./software/rapid-photo-downloader
-    ./software/signal
-    ./software/starship
-    ./software/telegram
-    ./software/vim
-    ./software/work-desktop
+    "${inputs.self}/home-manager/software/ansible"
+    (import "${inputs.self}/home-manager/common" { inherit custom inputs; })
+    "${inputs.self}/home-manager/software/calibre"
+    "${inputs.self}/home-manager/software/czkawka"
+    "${inputs.self}/home-manager/software/dunst"
+    (import "${inputs.self}/home-manager/software/emacs" { inherit custom pkgs; })
+    "${inputs.self}/home-manager/software/email"
+    "${inputs.self}/home-manager/software/evince"
+    "${inputs.self}/home-manager/software/fzf"
+    "${inputs.self}/home-manager/software/git"
+    "${inputs.self}/home-manager/software/grobi"
+    "${inputs.self}/home-manager/software/keeweb"
+    "${inputs.self}/home-manager/software/libimobiledevice"
+    "${inputs.self}/home-manager/software/mime-apps"
+    "${inputs.self}/home-manager/software/mpv"
+    "${inputs.self}/home-manager/software/nitrogen"
+    "${inputs.self}/home-manager/software/obsidian"
+    "${inputs.self}/home-manager/software/pycharm"
+    "${inputs.self}/home-manager/software/rapid-photo-downloader"
+    "${inputs.self}/home-manager/software/signal"
     "${inputs.self}/home-manager/software/ssh"
+    "${inputs.self}/home-manager/software/starship"
+    "${inputs.self}/home-manager/software/telegram"
+    "${inputs.self}/home-manager/software/vim"
+    "${inputs.self}/home-manager/software/work-desktop"
   ];
   home.packages = with pkgs; [
     arc-theme
@@ -43,9 +43,9 @@
   programs.git.userEmail = "andreas@zweili.ch";
 
   # raw config files
-  home.file.".config/qtile/config.py".source = ./configs/qtile/config.py;
-  home.file.".config/qtile/autostart.sh".source = ./configs/qtile/autostart.sh;
-  home.file.".config/terminator".source = ./configs/terminator;
+  home.file.".config/qtile/config.py".source = "${inputs.self}/home-manager/configs/qtile/config.py";
+  home.file.".config/qtile/autostart.sh".source = "${inputs.self}/home-manager/configs/qtile/autostart.sh";
+  home.file.".config/terminator".source = "${inputs.self}/home-manager/configs/terminator";
 
   programs.bash = {
     enable = true;
diff --git a/home-manager/headless.nix b/home-manager/headless.nix
index 38a6fb8..d9ade4d 100644
--- a/home-manager/headless.nix
+++ b/home-manager/headless.nix
@@ -1,11 +1,11 @@
 { inputs, custom, pkgs, ... }:
 {
   imports = [
-    (import ./common { inherit custom inputs; })
-    ./software/fzf
-    ./software/git
-    ./software/vim
-    ./software/starship
+    (import "${inputs.self}/home-manager/common" { inherit custom inputs; })
+    "${inputs.self}/home-manager/software/fzf"
+    "${inputs.self}/home-manager/software/git"
+    "${inputs.self}/home-manager/software/vim"
+    "${inputs.self}/home-manager/software/starship"
   ];
 
   programs.git.userEmail = "andreas@zweili.ch";
diff --git a/home-manager/management.nix b/home-manager/management.nix
index a6926da..a731b68 100644
--- a/home-manager/management.nix
+++ b/home-manager/management.nix
@@ -1,13 +1,14 @@
 { inputs, custom, pkgs, ... }:
 {
   imports = [
-    (import ./common { inherit custom inputs; })
-    ./software/emacs
-    ./software/email
-    ./software/fzf
-    ./software/git
-    ./software/starship
-    ./software/vim
+    (import "${inputs.self}/home-manager/common" { inherit custom inputs; })
+    "${inputs.self}/home-manager/software/emacs"
+    "${inputs.self}/home-manager/software/email"
+    "${inputs.self}/home-manager/software/fzf"
+    "${inputs.self}/home-manager/software/git"
+    "${inputs.self}/home-manager/software/ssh"
+    "${inputs.self}/home-manager/software/starship"
+    "${inputs.self}/home-manager/software/vim"
   ];
 
   programs.git.userEmail = "andreas@zweili.ch";
diff --git a/home-manager/ubuntu.nix b/home-manager/ubuntu.nix
index 97f4e9d..1bda4b2 100644
--- a/home-manager/ubuntu.nix
+++ b/home-manager/ubuntu.nix
@@ -1,8 +1,8 @@
 { ... }:
 {
   imports = [
-    ./common
-    ./software/git
+    "${inputs.self}/home-manager/common"
+    "${inputs.self}/home-manager/software/git"
   ];
 
   programs.git.userEmail = "andreas@zweili.ch";
diff --git a/home-manager/work-wsl.nix b/home-manager/work-wsl.nix
index a88490e..06facae 100644
--- a/home-manager/work-wsl.nix
+++ b/home-manager/work-wsl.nix
@@ -1,14 +1,14 @@
 { inputs, custom, pkgs, ... }:
 {
   imports = [
-    ./common
-    ./software/ansible
-    ./software/emacs
-    ./software/fzf
-    ./software/git
-    ./software/starship
-    ./software/vagrant-wsl
-    ./software/vim
+    "${inputs.self}/home-manager/common"
+    "${inputs.self}/home-manager/software/ansible"
+    "${inputs.self}/home-manager/software/emacs"
+    "${inputs.self}/home-manager/software/fzf"
+    "${inputs.self}/home-manager/software/git"
+    "${inputs.self}/home-manager/software/starship"
+    "${inputs.self}/home-manager/software/vagrant-wsl"
+    "${inputs.self}/home-manager/software/vim"
   ];
 
   programs.git.userEmail = "zweili@contria.com";
diff --git a/lib/mk_computer.nix b/lib/mk_computer.nix
index 6ba49b5..ac9453c 100644
--- a/lib/mk_computer.nix
+++ b/lib/mk_computer.nix
@@ -1,13 +1,13 @@
-{ custom, hostname, inputs, pkgs, self, system ? "x86_64-linux", home-module ? "headless" }: inputs.nixpkgs.lib.nixosSystem {
+{ custom, hostname, inputs, pkgs, system ? "x86_64-linux", home-module ? "headless" }: inputs.nixpkgs.lib.nixosSystem {
   inherit system pkgs;
   specialArgs = { inherit custom inputs; };
   modules = (
     [
       # System configuration for this host
-      "${self}/systems/${hostname}"
+      "${inputs.self}/systems/${hostname}"
 
       # Common configuration
-      "${self}/modules/common-x86"
+      "${inputs.self}/modules/common-x86"
 
       inputs.agenix.nixosModules.age
       { environment.systemPackages = [ inputs.agenix.defaultPackage.${system} ]; }
@@ -17,7 +17,7 @@
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
         home-manager.users.${custom.username}.imports = [
-          (import "${self}/home-manager/${home-module}.nix" { inherit custom pkgs inputs; })
+          (import "${inputs.self}/home-manager/${home-module}.nix" { inherit custom pkgs inputs; })
         ];
       }
     ]);
diff --git a/lib/mk_raspi.nix b/lib/mk_raspi.nix
index ae1c336..8f05765 100644
--- a/lib/mk_raspi.nix
+++ b/lib/mk_raspi.nix
@@ -1,13 +1,13 @@
-{ custom, hostname, inputs, pkgs, self, system ? "aarch64-linux", home-module ? "headless" }: input.nixpkgs.lib.nixosSystem {
+{ custom, hostname, inputs, pkgs, system ? "aarch64-linux", home-module ? "headless" }: input.nixpkgs.lib.nixosSystem {
   inherit system;
   specialArgs = { inherit custom inputs; };
   modules = (
     [
       # System configuration for this host
-      "${self}/systems/${hostname}"
+      "${inputs.self}/systems/${hostname}"
 
       # Common configuration
-      "${self}/modules/common"
+      "${inputs.self}/modules/common"
 
       inputs.agenix.nixosModules.age
       { environment.systemPackages = [ inputs.agenix.defaultPackage.${system} ]; }
@@ -17,7 +17,7 @@
         home-manager.useGlobalPkgs = true;
         home-manager.useUserPackages = true;
         home-manager.users.${custom.username}.imports = [
-          (import "${self}/home-manager/${home-module}.nix" { inherit custom pkgs inputs; })
+          (import "${inputs.self}/home-manager/${home-module}.nix" { inherit custom pkgs inputs; })
         ];
       }
     ]);