diff --git a/hosts/del/firefox.nix b/hosts/del/firefox.nix
index 4785735..5e9e8f9 100644
--- a/hosts/del/firefox.nix
+++ b/hosts/del/firefox.nix
@@ -27,7 +27,7 @@
                 aliases = [ "@nw" ];
             };
             "Home Manager Option Search" = {
-                url = "https://mipmip.github.io/home-manager-option-search?query={searchTerms}";
+                url = "https://home-manager-options.extranix.com/?release=master&query={searchTerms}";
                 faviconPath = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                 aliases = [ "@hm" ];
             };
diff --git a/hosts/hape/firefox.nix b/hosts/hape/firefox.nix
index 4785735..5e9e8f9 100644
--- a/hosts/hape/firefox.nix
+++ b/hosts/hape/firefox.nix
@@ -27,7 +27,7 @@
                 aliases = [ "@nw" ];
             };
             "Home Manager Option Search" = {
-                url = "https://mipmip.github.io/home-manager-option-search?query={searchTerms}";
+                url = "https://home-manager-options.extranix.com/?release=master&query={searchTerms}";
                 faviconPath = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                 aliases = [ "@hm" ];
             };
diff --git a/hosts/niks/firefox.nix b/hosts/niks/firefox.nix
index 4785735..5e9e8f9 100644
--- a/hosts/niks/firefox.nix
+++ b/hosts/niks/firefox.nix
@@ -27,7 +27,7 @@
                 aliases = [ "@nw" ];
             };
             "Home Manager Option Search" = {
-                url = "https://mipmip.github.io/home-manager-option-search?query={searchTerms}";
+                url = "https://home-manager-options.extranix.com/?release=master&query={searchTerms}";
                 faviconPath = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                 aliases = [ "@hm" ];
             };
diff --git a/hosts/work/firefox.nix b/hosts/work/firefox.nix
index 63cbe94..5e9e8f9 100644
--- a/hosts/work/firefox.nix
+++ b/hosts/work/firefox.nix
@@ -22,12 +22,12 @@
                 aliases = [ "@no" ];
             };
             "NixOS Wiki" = {
-                url = "https://wiki.nixos.org/index.php?search={searchTerms}";
+                url = "https://wiki.nixos.org/w/index.php?search={searchTerms}";
                 faviconPath = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                 aliases = [ "@nw" ];
             };
             "Home Manager Option Search" = {
-                url = "https://mipmip.github.io/home-manager-option-search?query={searchTerms}";
+                url = "https://home-manager-options.extranix.com/?release=master&query={searchTerms}";
                 faviconPath = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
                 aliases = [ "@hm" ];
             };