diff --git a/flake.lock b/flake.lock
index 7228163..abf13f7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,22 +17,6 @@
         "type": "github"
       }
     },
-    "felschr-nixpkgs": {
-      "locked": {
-        "lastModified": 1603300533,
-        "narHash": "sha256-WQpKeqOAFkXv1NSq+VCpU7B6WJ6jdopvlUO0TkMq+mU=",
-        "owner": "felschr",
-        "repo": "nixpkgs",
-        "rev": "30b1d77f15634bb7574edf33087cd80f4e85a245",
-        "type": "github"
-      },
-      "original": {
-        "owner": "felschr",
-        "ref": "feat/mosquitto-password-file",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -120,11 +104,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1603403461,
-        "narHash": "sha256-1BBTgps384veCOtCuHLdg8vuRNYyYPssWDQxsYQ5Lg8=",
+        "lastModified": 1604628022,
+        "narHash": "sha256-zCbTh91NBQdGRtO+GZxfKnmRjp+4rOQ2B8wtNpVcxgs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9bf1f40af124573a54fd208b1f539eb694ef31a6",
+        "rev": "4cc1b77c3fc4f4b3bc61921dda72663eea962fa3",
         "type": "github"
       },
       "original": {
@@ -136,11 +120,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1603153815,
-        "narHash": "sha256-uCav0CJ0Zm0vbqJiS9NUYD4XZg4Ww9bbsFzcDUzh2+U=",
+        "lastModified": 1604369895,
+        "narHash": "sha256-uB/ihiWdfTjVQ9sKdtj6xeyvb41uC2J4MXiOLkwJccs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "007126eef72271480cb7670e19e501a1ad2c1ff2",
+        "rev": "34ad166a830d3ac1541dcce571c52231f2f0865a",
         "type": "github"
       },
       "original": {
@@ -152,11 +136,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1603439551,
-        "narHash": "sha256-3ooAjBqsKFTLuBzxAqd/R9TrRV2MMhydGvCDQ/O+2Y0=",
+        "lastModified": 1604744395,
+        "narHash": "sha256-+7OS8LHjHzShJHBp4P0QEa16wvKHF3Zc9R36qot/2g0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "bb5e6db5349781136939bc24d891d4c7315ef566",
+        "rev": "49da2eff49d2bd9dd5483512323219bc68559bfa",
         "type": "github"
       },
       "original": {
@@ -194,7 +178,6 @@
     },
     "root": {
       "inputs": {
-        "felschr-nixpkgs": "felschr-nixpkgs",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
diff --git a/flake.nix b/flake.nix
index 31d8be9..42246b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,13 +1,6 @@
 {
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
-  inputs.felschr-nixpkgs = {
-    type = "github";
-    owner = "felschr";
-    repo = "nixpkgs";
-    ref = "feat/mosquitto-password-file";
-  };
-
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
   inputs.home-manager = {
@@ -24,7 +17,7 @@
     inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, felschr-nixpkgs, flake-utils, home-manager, nur, pre-commit-hooks }:
+  outputs = { self, nixpkgs, flake-utils, home-manager, nur, pre-commit-hooks }:
     let
       overlays = {
         deconz = self: super: {
@@ -87,11 +80,7 @@
         system = "aarch64-linux";
         modules = [
           nixpkgs.nixosModules.notDetected
-          {
-            disabledModules = [ "services/networking/mosquitto.nix" ];
-            imports = [ "${felschr-nixpkgs}/nixos/modules/services/networking/mosquitto.nix" ];
-          }
-	  { home-manager.users.felschr.imports = [ homeManagerModules.git ]; }
+          { home-manager.users.felschr.imports = [ homeManagerModules.git ]; }
           nixosModules.deconz
           (systemModule {
             hostName = "felix-rpi4";