--- a/storage.js
+++ b/storage.js
@@ -24,8 +24,8 @@ var errors = require('./errors');
 var config = require('./configuration');
 var service_configuration = config.service_configuration;
 var Configuration = config.Configuration;
-var utils = require('./util');
-var toBareJID = utils.toBareJID;
+var fdsq = require('./fdsq');
+var toBareJID = fdsq.toBareJID;
 
 var nodes = require('./nodes');
 var Node = nodes.Node;
@@ -206,7 +206,7 @@ storage.setItem = function(nodeID, itemI
 		return node;
 
 	if (typeof itemID != 'string')
-		itemID = utils.makeRandomId();
+		itemID = fdsq.makeRandomId();
 
 	i = node.setItem(itemID, content);
 	if (content)