diff --git a/configuration.nix b/configuration.nix
index 8ceafff..d83997d 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -36,6 +36,9 @@
 
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
+  nixpkgs.overlays = [
+    (import ./overlays/riot-web.nix)
+  ];
   environment.systemPackages = with pkgs; [
     neovim
     git
diff --git a/overlays/riot-web.nix b/overlays/riot-web.nix
new file mode 100644
index 0000000..74539b1
--- /dev/null
+++ b/overlays/riot-web.nix
@@ -0,0 +1,13 @@
+self: super:
+{
+  riot-web = super.riot-web.override {
+    conf = ''
+      {
+        "default_hs_url": "https://matrix.nyanlout.re",
+        "default_is_url": "https://vector.im",
+        "brand": "Nyanloutre",
+        "default_theme": "dark"
+      }
+    '';
+  };
+} 
diff --git a/services.nix b/services.nix
index c3f9f83..8b97835 100644
--- a/services.nix
+++ b/services.nix
@@ -108,18 +108,10 @@ in
   services.searx.enable = true;
 
   services.nginx.enable = true;
-  nixpkgs.overlays = [ (self: super: { riot-web_custom = super.riot-web.override { conf = ''
-    {
-      "default_hs_url": "https://matrix.nyanlout.re",
-      "default_is_url": "https://vector.im",
-      "brand": "Nyanloutre",
-      "default_theme": "dark"
-    }
-  ''; }; } ) ];
   services.nginx.virtualHosts = {
     "riot" = {
       listen = [ { addr = "127.0.0.1"; port = riot_port; } ];
-      locations = { "/" = { root = pkgs.riot-web_custom; }; };
+      locations = { "/" = { root = pkgs.riot-web; }; };
     };
     "organizr" = {
       listen = [ { addr = "127.0.0.1"; port = organizr_port; } ];