diff --git a/devices/android/default.nix b/devices/android/default.nix
index aec23d5..e6ed74e 100644
--- a/devices/android/default.nix
+++ b/devices/android/default.nix
@@ -1,45 +1,24 @@
-{pkgs, ...}: {
-  vars = {
-    mainUser = "nix-on-droid";
-    hostName = "localhost";
-    neovimIde = false;
+{
+  home-manager,
+  neovim-flake,
+  nix-on-droid,
+  nixpkgs,
+  ...
+} @ inputs: {
+  extraSpecialArgs = inputs;
+  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)
+    ];
   };
 
-  terminal.font = "${(pkgs.nerdfonts.override {
-    fonts = [
-      "JetBrainsMono"
-    ];
-  })}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf";
-
-  environment.packages = with pkgs; [
-    diffutils
-    findutils
-    utillinux
-    tzdata
-    hostname
-    man
-    gnugrep
-    ripgrep
-    gnupg
-    gnused
-    gnutar
-    bzip2
-    gzip
-    xz
-    zip
-    unzip
-    openssh
-    perl
-    alejandra
+  modules = [
+    {home-manager.extraSpecialArgs = inputs;}
+    ../../common/nix-on-droid.nix
+    ./nix-on-droid.nix
   ];
-
-  environment.etcBackupExtension = ".bak";
-  environment.motd = null;
-  home-manager.backupFileExtension = "hm-bak";
-
-  # Set your time zone.
-  time.timeZone = "America/Montreal";
-
-  # No touchy
-  system.stateVersion = "23.05";
 }
diff --git a/devices/android/nix-on-droid.nix b/devices/android/nix-on-droid.nix
new file mode 100644
index 0000000..aec23d5
--- /dev/null
+++ b/devices/android/nix-on-droid.nix
@@ -0,0 +1,45 @@
+{pkgs, ...}: {
+  vars = {
+    mainUser = "nix-on-droid";
+    hostName = "localhost";
+    neovimIde = false;
+  };
+
+  terminal.font = "${(pkgs.nerdfonts.override {
+    fonts = [
+      "JetBrainsMono"
+    ];
+  })}/share/fonts/truetype/NerdFonts/JetBrainsMonoNerdFontMono-Regular.ttf";
+
+  environment.packages = with pkgs; [
+    diffutils
+    findutils
+    utillinux
+    tzdata
+    hostname
+    man
+    gnugrep
+    ripgrep
+    gnupg
+    gnused
+    gnutar
+    bzip2
+    gzip
+    xz
+    zip
+    unzip
+    openssh
+    perl
+    alejandra
+  ];
+
+  environment.etcBackupExtension = ".bak";
+  environment.motd = null;
+  home-manager.backupFileExtension = "hm-bak";
+
+  # Set your time zone.
+  time.timeZone = "America/Montreal";
+
+  # No touchy
+  system.stateVersion = "23.05";
+}
diff --git a/flake.nix b/flake.nix
index 556489f..d51823e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,24 +53,7 @@
       ];
     };
 
-    nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
-      extraSpecialArgs = inputs;
-      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)
-        ];
-      };
-
-      modules = [
-        {home-manager.extraSpecialArgs = inputs;}
-        ./common/nix-on-droid.nix
-        ./devices/android
-      ];
-    };
+    nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration (import ./devices/android inputs);
 
     formatter = perSystem (_: pkgs: pkgs.alejandra);