diff --git a/default.nix b/default.nix
deleted file mode 100644
index d6d2a3c..0000000
--- a/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ buildGoModule }:
-
-buildGoModule rec {
-  name = "filebot";
-  src = ./.;
-  version = "v1.0.0";
-
-  vendorHash = "sha256-zga1pCBqisDLzDN6rO68iCQlGXmTfkUk+fqNI54yhNo=";
-
-  patches = [
-    "./patches/fix(config)__changed_path_for_nix_build.patch"
-  ];
-}
diff --git a/flake.lock b/flake.lock
index 843b2db..52d9fe0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1708475490,
-        "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
+        "lastModified": 1710451336,
+        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0e74ca98a74bc7270d28838369593635a5db3260",
+        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ecab851..04b1d32 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,17 +1,23 @@
 {
-  description = "Filebot - program to automaticlly moving files from one place to another";
+  description =
+    "Filebot - program to automaticlly moving files from one place to another";
 
   inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
 
   outputs = { self, nixpkgs, }:
     let
       pkgs = import nixpkgs { system = "x86_64-linux"; };
-      filebot = pkgs.callPackage ./default.nix { };
-      go = pkgs.go;
-    in
-    {
-      packages.x86_64-linux.default = filebot;
-      nixosModules."filebot" = import ./service.nix;
+    in rec {
+      packages.x86_64-linux.default = pkgs.buildGoModule {
+        name = "filebot";
+        src = ./.;
+        version = "v1.0.0";
+
+        vendorHash = "sha256-zga1pCBqisDLzDN6rO68iCQlGXmTfkUk+fqNI54yhNo=";
+
+        patches = [ "./patches/fix(config)__changed_path_for_nix_build.patch" ];
+      };
+      nixosModules."filebot" = pkgs.callPackage ./service.nix { filebot = packages.x86_64-linux.default; };
       devShells.x86_64-linux.default = pkgs.mkShell {
         hardeningDisable = [ "all" ];
         buildInputs = with pkgs; [
@@ -19,11 +25,14 @@
           go
           golangci-lint
 
+          # Nix
+          nixfmt
+
           # Github actions 
           act
         ];
 
-        GOROOT = "${go}/share/go";
+        GOROOT = "${pkgs.go}/share/go";
       };
     };
 }
diff --git a/service.nix b/service.nix
index 5fba774..1a58c8f 100644
--- a/service.nix
+++ b/service.nix
@@ -1,8 +1,7 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, filebot, ... }:
 
 let
   cfg = config.services.filebot;
-  program = pkgs.callPackage ./default.nix { };
 in
 {
   options = {
@@ -46,7 +45,7 @@ in
       serviceConfig.User = "${cfg.user}";
       wantedBy = [ "multi-user.target" ];
       script = ''
-        ${program}/bin/filebot -c ${builtins.toString cfg.configPath} -u ${cfg.updateInterval}
+        ${filebot}/bin/filebot -c ${builtins.toString cfg.configPath} -u ${cfg.updateInterval}
       '';
     };
   };