diff --git a/zet b/zet
index 7dc7245..d73d649 100755
--- a/zet
+++ b/zet
@@ -170,7 +170,9 @@ main() {
 }
 
 new_zid() {
-  date '+%Y%m%d%H%M%S'
+  EXISTING_ZETTELS=$(find . -maxdepth 1 -type d -regex './[0-9]+' | wc -l)
+
+  echo $((EXISTING_ZETTELS + 1))
 }
 
 on_save() {
@@ -202,7 +204,7 @@ search_zettel() {
 
   QUERY="$*"
 
-  git grep -i --name-only -E "$QUERY" | grep -o -E '[0-9]{14}' | sort | uniq
+  git grep -i --name-only -E "$QUERY" | grep -o -E '[0-9]+' | sort -un
 }
 
 select_zet() {