diff --git a/common/default.nix b/common/default.nix
index 5f0850d..424753d 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -7,12 +7,11 @@
   nurl,
   pkgs,
   ...
-}: {
+} @ inputs: {
   imports = [
     ./vars.nix
 
     ./modules
-    ./overlays
     ./pkgs
 
     nur.nixosModules.nur
@@ -20,7 +19,10 @@
     home-manager.nixosModules.home-manager
   ];
 
-  nixpkgs.config.allowUnfree = true;
+  nixpkgs = {
+    config.allowUnfree = true;
+    overlays = import ./overlays inputs;
+  };
   boot.tmp.cleanOnBoot = true;
 
   nix = {
diff --git a/common/overlays/default.nix b/common/overlays/default.nix
index abab5eb..c605ad7 100644
--- a/common/overlays/default.nix
+++ b/common/overlays/default.nix
@@ -2,14 +2,12 @@
   neovim-flake,
   nixpkgs-wayland,
   ...
-} @ inputs: {
-  nixpkgs.overlays = [
-    (import ./dracula-theme inputs)
-    (import ./plymouth inputs)
-    (import ./spotifywm inputs)
-    (import ./squeekboard)
+} @ inputs: [
+  (import ./dracula-theme inputs)
+  (import ./plymouth inputs)
+  (import ./spotifywm inputs)
+  (import ./squeekboard)
 
-    neovim-flake.overlay
-    nixpkgs-wayland.overlay
-  ];
-}
+  neovim-flake.overlay
+  nixpkgs-wayland.overlay
+]
diff --git a/devices/android/default.nix b/devices/android/default.nix
index e6ed74e..8e42d53 100644
--- a/devices/android/default.nix
+++ b/devices/android/default.nix
@@ -1,7 +1,5 @@
 {
   home-manager,
-  neovim-flake,
-  nix-on-droid,
   nixpkgs,
   ...
 } @ inputs: {
@@ -9,11 +7,7 @@
   home-manager-path = home-manager.outPath;
   pkgs = import nixpkgs {
     system = "aarch64-linux";
-    overlays = [
-      nix-on-droid.overlays.default
-      neovim-flake.overlay
-      (import ../../common/overlays/dracula-theme inputs)
-    ];
+    overlays = import ../../common/overlays inputs;
   };
 
   modules = [
diff --git a/flake.nix b/flake.nix
index d51823e..ac4af89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,6 +28,9 @@
           ]
           ++ mods;
       };
+
+    # Nix-On-Droid
+    inherit (nix-on-droid.lib) nixOnDroidConfiguration;
   in {
     nixosConfigurations = {
       wim = mkNixOS [
@@ -53,7 +56,9 @@
       ];
     };
 
-    nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration (import ./devices/android inputs);
+    nixOnDroidConfigurations.default = nixOnDroidConfiguration (
+      import ./devices/android inputs
+    );
 
     formatter = perSystem (_: pkgs: pkgs.alejandra);