diff --git a/services/minecraft/default.nix b/hosts/greddost/services/minecraft/default.nix
similarity index 100%
rename from services/minecraft/default.nix
rename to hosts/greddost/services/minecraft/default.nix
diff --git a/services/minecraft/minecraft-server-fabric.nix b/hosts/greddost/services/minecraft/minecraft-server-fabric.nix
similarity index 100%
rename from services/minecraft/minecraft-server-fabric.nix
rename to hosts/greddost/services/minecraft/minecraft-server-fabric.nix
diff --git a/hosts/jokum/configuration.nix b/hosts/jokum/configuration.nix
index e2d017d0..f00a0472 100644
--- a/hosts/jokum/configuration.nix
+++ b/hosts/jokum/configuration.nix
@@ -9,8 +9,8 @@
 
       ../../misc/rust-motd.nix
 
-      ../../services/matrix
-      ../../services/nginx
+      ./services/matrix
+      ./services/nginx
     ];
 
   sops.defaultSopsFile = ../../secrets/jokum/jokum.yaml;
diff --git a/services/matrix/coturn.nix b/hosts/jokum/services/matrix/coturn.nix
similarity index 100%
rename from services/matrix/coturn.nix
rename to hosts/jokum/services/matrix/coturn.nix
diff --git a/services/matrix/default.nix b/hosts/jokum/services/matrix/default.nix
similarity index 100%
rename from services/matrix/default.nix
rename to hosts/jokum/services/matrix/default.nix
diff --git a/services/matrix/discord.nix b/hosts/jokum/services/matrix/discord.nix
similarity index 100%
rename from services/matrix/discord.nix
rename to hosts/jokum/services/matrix/discord.nix
diff --git a/services/matrix/element.nix b/hosts/jokum/services/matrix/element.nix
similarity index 100%
rename from services/matrix/element.nix
rename to hosts/jokum/services/matrix/element.nix
diff --git a/services/matrix/synapse-admin.nix b/hosts/jokum/services/matrix/synapse-admin.nix
similarity index 100%
rename from services/matrix/synapse-admin.nix
rename to hosts/jokum/services/matrix/synapse-admin.nix
diff --git a/services/matrix/synapse.nix b/hosts/jokum/services/matrix/synapse.nix
similarity index 100%
rename from services/matrix/synapse.nix
rename to hosts/jokum/services/matrix/synapse.nix
diff --git a/services/nginx/default.nix b/hosts/jokum/services/nginx/default.nix
similarity index 100%
rename from services/nginx/default.nix
rename to hosts/jokum/services/nginx/default.nix