diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index b6a95f3a..6b4d6bdb 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -42,6 +42,7 @@ function SvgCanvas(c)
 
 // private functions
 	var getId = function() {
+	    if (events["getid"]) return call("getid",obj_num);
 		return idprefix+obj_num;
 	}
 
diff --git a/wave/svg-edit.xml b/wave/svg-edit.xml
index 2599cb32..6d578371 100644
--- a/wave/svg-edit.xml
+++ b/wave/svg-edit.xml
@@ -257,18 +257,18 @@ SVG-edit Google Wave Gadget @ <a href="http://svg-edit.googlecode.com/" target="
 		wave.getState().submitDelta(delta);
 	}
 	
-	function setupId() {
-		svgCanvas.setIdPrefix("svg_"+wave.Participant().getId()+"_");
+	function getId(objnum) {
+		return "svg_"+wave.getViewer().getId()+"_"+objnum;
 	}
 
 	function main() {
 		svgCanvas = svg_edit_setup();
 		if (wave && wave.isInWaveContainer()) {
 			wave.setStateCallback(stateUpdated);
-			wave.setParticipantCallback(setupId);
 		}
 		svgCanvas.bind("changed", sendDelta);
 		svgCanvas.bind("cleared", stateUpdated);
+		svgCanvas.bind("getid", getId);
 	}
 
 	gadgets.util.registerOnLoadHandler(main);