diff --git a/Makefile b/Makefile
index cc1f62c..8f6240e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,27 @@
 DEVICE=root@biscuit.lan
+# NFLAGS=-I nixpkgs=../nixpkgs
 
-.PHONY: toplevel android-bootimg default update
+.PHONY: toplevel android-bootimg default update android-recovery
 
-default:
-	nix-build -A outputs.$@ -o $@
+default toplevel:
+	nix-build $(NFLAGS) -A outputs.$@ -o $@
 
-android-bootimg:
-	nix-build -A outputs.android.$@ -o $@
-
-toplevel:
-	nix-build -A outputs.$@ -o $@
+android-bootimg android-recovery:
+	nix-build  $(NFLAGS) -A outputs.android.$@ -o $@
 
 update: toplevel android-bootimg
 	nix-copy-closure --to $(DEVICE) -v --include-outputs ./toplevel
 	ssh $(DEVICE) "nix-env --profile /nix/var/nix/profiles/system --set `readlink toplevel`  && /nix/var/nix/profiles/system/bin/switch-to-configuration switch"
 	cat android-bootimg | ssh $(DEVICE) "cat >/boot/boot.img"
+
+boot-in-system.img: default
+	dd if=/dev/zero of=$@ bs=1M count=50
+	mkdir -p boot-in-system
+	-rm -f boot-in-system/boot.img
+	(cd boot-in-system && cp ../default/boot.img .)
+	mke2fs -d boot-in-system boot-in-system.img
+
+
+flash: default boot-in-system.img
+	fastboot flash system boot-in-system.img
+	fastboot flash userdata default/system.img