diff --git a/launch/launch-node.py b/launch/launch-node.py
index e38ac8c7f4..5ee77f5e4e 100755
--- a/launch/launch-node.py
+++ b/launch/launch-node.py
@@ -194,12 +194,13 @@ def main():
                                        cert)):
         raise Exception("Please specify the name of a signed puppet cert.")
 
-    flavors = [f for f in client.flavors.list() if options.flavor in f.name]
+    flavors = [f for f in client.flavors.list()
+               if options.flavor in (f.name, f.id)]
     flavor = flavors[0]
     print "Found flavor", flavor
 
     images = [i for i in client.images.list()
-              if (options.image.lower() in i.name.lower() and
+              if (options.image.lower() in (i.id, i.name.lower()) and
                   not i.name.endswith('(Kernel)') and
                   not i.name.endswith('(Ramdisk)'))]