diff --git a/flake.nix b/flake.nix
index ce2648c..dbb7c24 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,7 +34,7 @@
           };
 
           modules = [
-            ./hosts/trantor
+            ./nixos/hosts/trantor
             home-manager.nixosModules.home-manager
             impermanence.nixosModules.impermanence
           ];
@@ -49,7 +49,7 @@
           };
 
           modules = [
-            ./hosts/capibara
+            ./nixos/hosts/capibara
             nixos-hardware.nixosModules.lenovo-thinkpad-x230
             home-manager.nixosModules.home-manager
             impermanence.nixosModules.impermanence
diff --git a/home/hosts/capibara.nix b/home/hosts/capibara.nix
index 9fde48c..6dacdd6 100644
--- a/home/hosts/capibara.nix
+++ b/home/hosts/capibara.nix
@@ -4,6 +4,6 @@
   imports = [
     ./common.nix
     ../modules/desktop-river
-    ./theming
+    ../modules/theming
   ];
 }
diff --git a/home/hosts/common.nix b/home/hosts/common.nix
index 382c4b5..db2f0bc 100644
--- a/home/hosts/common.nix
+++ b/home/hosts/common.nix
@@ -76,38 +76,36 @@
   home.homeDirectory = "/home/rilla";
 
   imports = [
-    ./arduino
-    # ./barrier
-    ./browsers
-    ./cheat
-    ./dav
-    ./drawterm
-    ./fonts
-    ./git
-    ./gotify
-    ./gpg
-    ./idasen
-    ./lf
-    ./mail
-    ./maker
     # ./minidisc
-    ./mpd
-    ./msg
-    ./music
-    ./neovim
-    #./nsxiv
-    ./pass
-    ./rss
-    ./snapcast
-    ./sound
-    ./ssh
-    ./syncthing
-    ./tmux
-    ./vitetris
-    ./wallets
-    ./wine
-    ./xdg
-    ./zsh
+    ../modules/arduino
+    ../modules/browsers
+    ../modules/cheat
+    ../modules/dav
+    ../modules/drawterm
+    ../modules/fonts
+    ../modules/git
+    ../modules/gotify
+    ../modules/gpg
+    ../modules/idasen
+    ../modules/lf
+    ../modules/mail
+    ../modules/maker
+    ../modules/mpd
+    ../modules/msg
+    ../modules/music
+    ../modules/neovim
+    ../modules/pass
+    ../modules/rss
+    ../modules/snapcast
+    ../modules/sound
+    ../modules/ssh
+    ../modules/syncthing
+    ../modules/tmux
+    ../modules/vitetris
+    ../modules/wallets
+    ../modules/wine
+    ../modules/xdg
+    ../modules/zsh
   ];
 
   home.sessionVariables = {
diff --git a/justfile b/justfile
index ccbf809..9ed87df 100644
--- a/justfile
+++ b/justfile
@@ -1,2 +1,5 @@
 echidna:
     home-manager switch --flake .#rilla@echidna
+
+capibara:
+    doas nixos-rebuild switch --flake .#capibara
diff --git a/nixos/hosts/capibara/default.nix b/nixos/hosts/capibara/default.nix
index 64efda0..2d5b61a 100644
--- a/nixos/hosts/capibara/default.nix
+++ b/nixos/hosts/capibara/default.nix
@@ -21,7 +21,7 @@ let
 in
 {
   imports = [
-    ./hardware-configuration/capibara.nix
+    ./hardware-configuration.nix
     ../../modules/common
     ../../modules/common/desktop.nix
   ];
diff --git a/nixos/hosts/trantor/default.nix b/nixos/hosts/trantor/default.nix
index e6fee11..76c8826 100644
--- a/nixos/hosts/trantor/default.nix
+++ b/nixos/hosts/trantor/default.nix
@@ -7,7 +7,7 @@
 let home = "/home/rilla";
 in {
   imports = [
-    ./hardware-configuration/trantor.nix
+    ./hardware-configuration.nix
     ../../modules/common
     ../../modules/common/desktop.nix
   ];