diff --git a/flake.nix b/flake.nix
index c8b0377..19fb041 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,12 +42,19 @@
           imports =
             [ hardwareConfig home-manager.nixosModules.home-manager config ];
         });
-    in {
+    in rec {
+
+      inherit overlays;
+
+      nixosModules.deconz = import ./services/deconz.nix;
+
+      homeManagerModules.git = import ./home/modules/git.nix;
 
       nixosConfigurations.felix-nixos = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           nixpkgs.nixosModules.notDetected
+          { home-manager.users.felschr.imports = [ homeManagerModules.git ]; }
           (systemModule {
             hostName = "felix-nixos";
             hardwareConfig = ./hardware/felix-nixos.nix;
@@ -60,6 +67,7 @@
         system = "x86_64-linux";
         modules = [
           nixpkgs.nixosModules.notDetected
+          { home-manager.users.felschr.imports = [ homeManagerModules.git ]; }
           (systemModule {
             hostName = "pilot1";
             hardwareConfig = ./hardware-configuration.nix; # TODO
@@ -72,6 +80,7 @@
         system = "aarch64-linux";
         modules = [
           nixpkgs.nixosModules.notDetected
+          nixosModules.deconz
           (systemModule {
             hostName = "felix-rpi4";
             hardwareConfig = ./hardware/rpi4.nix;
@@ -80,12 +89,6 @@
         ];
       };
 
-      inherit overlays;
-
-      nixosModules.deconz = import ./services/deconz.nix;
-
-      homeManagerModules.git = import ./home/modules/git.nix;
-
     } // flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = nixpkgs.legacyPackages.${system};
diff --git a/home/git.nix b/home/git.nix
index 7f1ba19..2e9456e 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -1,8 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./modules/git.nix ];
-
   programs.git = {
     enable = true;
     profiles = {
diff --git a/services/home-assistant.nix b/services/home-assistant.nix
index 3190838..e9f62c6 100644
--- a/services/home-assistant.nix
+++ b/services/home-assistant.nix
@@ -1,8 +1,6 @@
 { config, pkgs, pydeconz, ... }:
 
 with pkgs; {
-  imports = [ ./deconz.nix ];
-
   environment.systemPackages = with pkgs; [ deconz ];
 
   local.services.deconz = {