Accessing an Ubuntu desktop from Mac OS X Lion [UPDATED]

I've got this working now, but it's more complicated than it ought to be...