diff --git a/flake.nix b/flake.nix
index 597ac32..992c7d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,11 +99,9 @@
             simplesamlphp = final.callPackage ./packages/simplesamlphp { };
             bluemap = final.callPackage ./packages/bluemap.nix { };
           })
-          inputs.nix-gitea-themes.overlays.default
           inputs.pvv-nettsiden.overlays.default
         ];
         modules = [
-          inputs.nix-gitea-themes.nixosModules.default
           inputs.pvv-nettsiden.nixosModules.default
         ];
       };
@@ -117,7 +115,14 @@
       #ildkule-unstable = unstableNixosConfig "ildkule" { };
       shark = stableNixosConfig "shark" { };
 
-      kommode = stableNixosConfig "kommode" { };
+      kommode = stableNixosConfig "kommode" {
+        overlays = [
+          inputs.nix-gitea-themes.overlays.default
+        ];
+        modules = [
+          inputs.nix-gitea-themes.nixosModules.default
+        ];
+      };
 
       ustetind = stableNixosConfig "ustetind" {
         modules = [
diff --git a/hosts/bekkalokk/configuration.nix b/hosts/bekkalokk/configuration.nix
index df0cf6e..1a1200c 100644
--- a/hosts/bekkalokk/configuration.nix
+++ b/hosts/bekkalokk/configuration.nix
@@ -7,7 +7,6 @@
     (fp /misc/metrics-exporters.nix)
 
     ./services/bluemap/default.nix
-    ./services/gitea/default.nix
     ./services/idp-simplesamlphp
     ./services/kerberos
     ./services/mediawiki
diff --git a/hosts/kommode/configuration.nix b/hosts/kommode/configuration.nix
index b8e9cee..6305162 100644
--- a/hosts/kommode/configuration.nix
+++ b/hosts/kommode/configuration.nix
@@ -5,6 +5,9 @@
     ./hardware-configuration.nix
     (fp /base)
     (fp /misc/metrics-exporters.nix)
+
+    ./services/gitea
+    ./services/nginx.nix
   ];
 
   sops.defaultSopsFile = fp /secrets/kommode/kommode.yaml;
diff --git a/hosts/bekkalokk/services/gitea/customization.nix b/hosts/kommode/services/gitea/customization.nix
similarity index 100%
rename from hosts/bekkalokk/services/gitea/customization.nix
rename to hosts/kommode/services/gitea/customization.nix
diff --git a/hosts/bekkalokk/services/gitea/default.nix b/hosts/kommode/services/gitea/default.nix
similarity index 100%
rename from hosts/bekkalokk/services/gitea/default.nix
rename to hosts/kommode/services/gitea/default.nix
diff --git a/hosts/bekkalokk/services/gitea/gpg.nix b/hosts/kommode/services/gitea/gpg.nix
similarity index 100%
rename from hosts/bekkalokk/services/gitea/gpg.nix
rename to hosts/kommode/services/gitea/gpg.nix
diff --git a/hosts/bekkalokk/services/gitea/import-users/default.nix b/hosts/kommode/services/gitea/import-users/default.nix
similarity index 100%
rename from hosts/bekkalokk/services/gitea/import-users/default.nix
rename to hosts/kommode/services/gitea/import-users/default.nix
diff --git a/hosts/bekkalokk/services/gitea/import-users/gitea-import-users.py b/hosts/kommode/services/gitea/import-users/gitea-import-users.py
similarity index 100%
rename from hosts/bekkalokk/services/gitea/import-users/gitea-import-users.py
rename to hosts/kommode/services/gitea/import-users/gitea-import-users.py
diff --git a/hosts/bekkalokk/services/gitea/labels/projects.json b/hosts/kommode/services/gitea/labels/projects.json
similarity index 100%
rename from hosts/bekkalokk/services/gitea/labels/projects.json
rename to hosts/kommode/services/gitea/labels/projects.json
diff --git a/hosts/bekkalokk/services/gitea/loading.apng b/hosts/kommode/services/gitea/loading.apng
similarity index 100%
rename from hosts/bekkalokk/services/gitea/loading.apng
rename to hosts/kommode/services/gitea/loading.apng
diff --git a/hosts/bekkalokk/services/gitea/web-secret-provider/default.nix b/hosts/kommode/services/gitea/web-secret-provider/default.nix
similarity index 100%
rename from hosts/bekkalokk/services/gitea/web-secret-provider/default.nix
rename to hosts/kommode/services/gitea/web-secret-provider/default.nix
diff --git a/hosts/bekkalokk/services/gitea/web-secret-provider/gitea-web-secret-provider.py b/hosts/kommode/services/gitea/web-secret-provider/gitea-web-secret-provider.py
similarity index 100%
rename from hosts/bekkalokk/services/gitea/web-secret-provider/gitea-web-secret-provider.py
rename to hosts/kommode/services/gitea/web-secret-provider/gitea-web-secret-provider.py
diff --git a/hosts/kommode/services/nginx.nix b/hosts/kommode/services/nginx.nix
new file mode 100644
index 0000000..41197d8
--- /dev/null
+++ b/hosts/kommode/services/nginx.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  services.nginx.enable = true;
+}