diff --git a/README.org b/README.org
index 886a3ec..12e2d65 100644
--- a/README.org
+++ b/README.org
@@ -431,7 +431,7 @@ Build the activation package with ~nix build .#android --impure~, and activate i
 The Raspberry Pi Model B-8GB[fn:15] is the latest product in the popular Raspberry Pi range of computers. It offers groundbreaking increases in processor speed, multimedia performance, memory, and connectivity compared to the prior generation. On NixOS[fn:4], the Raspberry Pi family is /only/ supported on the =AArch64= platform, although there is community support for =armv6l= and =armv7l=.
 
 #+NAME: host-homecloud
-#+BEGIN_SRC nix
+#+BEGIN_SRC nix :noweb yes
 homecloud = nixpkgs.lib.nixosSystem {
   system = "aarch64-linux";
   specialArgs = { inherit inputs; };
@@ -2263,7 +2263,10 @@ PlantUML Mode[fn:71] is a major mode for editing PlantUML[fn:70] sources in GNU/
 #+NAME: emacs-plantuml-elisp
 #+BEGIN_SRC emacs-lisp
 ;; Configure `plantuml-mode'.
-(setq plantuml-default-exec-mode 'executable)
+(add-to-list 'org-src-lang-modes '("plantuml" . plantuml))
+(org-babel-do-load-languages 'org-babel-load-languages '((plantuml . t)))
+(setq plantuml-default-exec-mode 'executable
+      org-plantuml-exec-mode 'plantuml)
 #+END_SRC
 
 ** Swiper
diff --git a/flake.lock b/flake.lock
index 9bd7952..3b5b595 100644
--- a/flake.lock
+++ b/flake.lock
@@ -15,6 +15,21 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1623660459,
+        "narHash": "sha256-OTmOsh43po7r5F9s9H6lVCBQ2b0FikWbmiwLbMAGRdw=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "98c8d36b1828009b20f12544214683c7489935a1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -35,6 +50,49 @@
         "type": "github"
       }
     },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1623793605,
+        "narHash": "sha256-8LaC7Y+Z+TTZuTvBL/mlfkEQ6Ey0hwwAeVUmY95Tni4=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "63af2d3e4cac0a84a87b72be0135f5bcec5a9d5d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nix-on-droid": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "home-manager": "home-manager_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1622161517,
+        "narHash": "sha256-bApAMlsNe+JZRIMKKM3O9SdMAzq0TezoG5hzUP4ufVU=",
+        "owner": "t184256",
+        "repo": "nix-on-droid",
+        "rev": "36df7dac110a85f18e30611cecaf8ee95855bc22",
+        "type": "github"
+      },
+      "original": {
+        "owner": "t184256",
+        "ref": "master",
+        "repo": "nix-on-droid",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1623143341,
@@ -84,6 +142,7 @@
       "inputs": {
         "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
+        "nix-on-droid": "nix-on-droid",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
diff --git a/flake.nix b/flake.nix
index 7adb2f5..7b8e22a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -72,10 +72,10 @@
         specialArgs = { inherit inputs; };
         modules = [
           ./hosts/homecloud
-          <<module-flakes>>
-          <<module-cachix>>
-          <<module-docker>>
-          <<module-jellyfin>>
+          ./modules/flakes.nix
+          ./modules/cachix.nix
+          ./modules/docker.nix
+          ./modules/jellyfin.nix
         ];
       };
       raspberry = nixpkgs.lib.nixosSystem {