I wish there was too. I'm still having the issue with 2.1 as well. I made it to 160 hours of up time the last time it buggered up.
I dont have a car dock, or any other kind of dock. So the issue for me is not related to docks or magnets.
Has anyone read any similar complaints from Nexus One users? or any other phones? Is this a hardware specific issue?
I had trouble getting any lock at all. I followed the suggestion of slowly rotating the phone three or four times on all three axis - and voila - synced right up.