diff --git a/tools/qsh/impl/impl.go b/tools/qsh/impl/impl.go
index 086f9a4..d349a92 100644
--- a/tools/qsh/impl/impl.go
+++ b/tools/qsh/impl/impl.go
@@ -1,6 +1,3 @@
-// TODO(kash): Rewrite this to use the new dir/object store api.
-// +build ignore
-
 package impl
 
 import (
@@ -12,7 +9,6 @@
 	"veyron2/context"
 	"veyron2/query"
 	"veyron2/storage"
-	"veyron2/storage/vstore"
 
 	// TODO(rjkroege@google.com): Replace with the appropriate vom2 functionality
 	// when available.
@@ -72,6 +68,6 @@
 	return nil
 }
 
-func RunQuery(ctx context.T, queryRoot, queryString string) error {
-	return printStream(vstore.New().Bind(queryRoot).Query(ctx, query.Query{queryString}), os.Stdout, 0)
+func RunQuery(ctx context.T, queryRoot storage.Dir, queryString string) error {
+	return printStream(queryRoot.Query(ctx, query.Query{queryString}), os.Stdout, 0)
 }
diff --git a/tools/qsh/impl/impl_test.go b/tools/qsh/impl/impl_test.go
index de9b274..8419b95 100644
--- a/tools/qsh/impl/impl_test.go
+++ b/tools/qsh/impl/impl_test.go
@@ -1,6 +1,3 @@
-// TODO(kash): Rewrite this to use the new dir/object store api.
-// +build ignore
-
 package impl
 
 import (
diff --git a/tools/qsh/main.go b/tools/qsh/main.go
index 7f2a4a4..2588b5e 100644
--- a/tools/qsh/main.go
+++ b/tools/qsh/main.go
@@ -1,6 +1,3 @@
-// TODO(kash): Rewrite this to use the new dir/object store api.
-// +build ignore
-
 package main
 
 import (
@@ -10,6 +7,7 @@
 	"veyron/tools/qsh/impl"
 
 	"veyron2/rt"
+	"veyron2/storage/vstore"
 )
 
 var flagQueryRoot = flag.String("queryroot", "",
@@ -36,7 +34,7 @@
 		log.Fatalf("qsh: No queryroot specified\n" + usage)
 	}
 
-	err := impl.RunQuery(r.NewContext(), queryRoot, queryStringArgs[0])
+	err := impl.RunQuery(r.NewContext(), vstore.BindDir(queryRoot), queryStringArgs[0])
 	if err != nil {
 		log.Printf("qsh: When attempting query: \"%s\" experienced an error: ", queryStringArgs[0], err.Error())
 	}