--- a/modules/mod_publish.js
+++ b/modules/mod_publish.js
@@ -2,8 +2,8 @@ var config = require('../configuration')
 var storage = require('../storage');
 var notifs = require('../notifs');
 var errors = require('../errors');
-var utils = require('../util');
-var toBareJID = utils.toBareJID;
+var fdsq = require('../fdsq');
+var toBareJID = fdsq.toBareJID;
 var NS = require('../namespaces');
 
 // SECTION 7.1: Publish an Item to a Node
@@ -38,7 +38,7 @@ exports.publish = {
 		var itemID = item.getAttribute('id');
 		if (!config.enabled('item-ids') && itemID)
 			return makeError(response, errors.itemid_required.n);
-		itemID = itemID? itemID: utils.makeRandomId();
+		itemID = itemID? itemID: fdsq.makeRandomId();
 
 		if (item.tags.length != 1)
 			return makeError(response, errors.pub.publish.bad_payload.n);