diff --git a/modules/nixos/homeassistant/services/homeassistant/default.nix b/modules/nixos/homeassistant/services/homeassistant/default.nix
index 4c0cad7..93888b8 100644
--- a/modules/nixos/homeassistant/services/homeassistant/default.nix
+++ b/modules/nixos/homeassistant/services/homeassistant/default.nix
@@ -3,6 +3,7 @@
   lib,
   pkgs,
   namespace,
+  inputs,
   ...
 }:
 with lib;
@@ -10,7 +11,16 @@ let
   cfg = config.${namespace}.services.home-assistant;
 in
 {
+  disabledModules = [
+    "services/home-automation/home-assistant.nix"
+  ];
+
+  imports = [
+    "${inputs.nixpkgs-unstable}/nixos/modules/services/home-automation/home-assistant.nix"
+  ];
+
   config = mkIf cfg.enable {
+
     services.home-assistant = {
       enable = true;
       openFirewall = true;
@@ -76,9 +86,9 @@ in
         "fully_kiosk"
         "generic"
         "generic_thermostat"
-        "geo_json_events"
-        "geo_location"
-        "geo_rss_events"
+        # "geo_json_events"
+        # "geo_location"
+        # "geo_rss_events"
         "github"
         "gitlab_ci"
         "glances"
diff --git a/overlays/homeassistant/default.nix b/overlays/homeassistant/default.nix
index 0ec6eae..1c8ddf7 100644
--- a/overlays/homeassistant/default.nix
+++ b/overlays/homeassistant/default.nix
@@ -1,6 +1,6 @@
-{ ... }:
+{ inputs, ... }:
 final: _prev: {
-  home-assistant = final.unstable.home-assistant;
-  home-assistant-custom-components = final.unstable.home-assistant-custom-components;
-  python3Packages = final.unstable.python3Packages;
+  inherit (inputs.nixpkgs-unstable.home-assistant);
+  # home-assistant = final.unstable.home-assistant;
+  # home-assistant-custom-components = final.unstable.home-assistant-custom-components;
 }