diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 7fb0f18d..2961f99e 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -15,7 +15,9 @@ rec {
   # Arguments with matching names are "plugged in" into the right slots,
   # the case of different arity is handled by always providing ellipses (...) in module definitions
   imports = [
+    # Import the host-specific user-config
     ./${hostname}
+
     ../../modules
 
     # inputs.nixvim.homeManagerModules.nixvim
@@ -134,6 +136,7 @@ rec {
   # Add stuff for your user as you see fit:
   home.packages = with pkgs; [
     # Firefox hardware video acceleration
+    # TODO
     libva
     libva-utils
     nvidia-vaapi-driver
diff --git a/lib/nixos.nix b/lib/nixos.nix
index dec56dd0..9674fcba 100644
--- a/lib/nixos.nix
+++ b/lib/nixos.nix
@@ -18,10 +18,7 @@ in {
         { nixpkgs.pkgs = pkgs; }
 
         # Main config file for all configs/hosts
-        ../nixos/configuration.nix
-
-        # Host specifig config file
-        ../nixos/${hostname}
+        ../nixos
       ]
 
       extraModules