I am an Indonesian and currently living in Shanghai doing a management training. My company is helping me to apply for the Z visa (working visa). To get the Z visa, I heard that you have to leave the country and reenter it again with the Z visa. Therefore, my company asked me to go to Hong Kong. Now, The problem is my passport is going to expire in May 2011, and I cannot renew my passport with the Indonesian Consulate in Guangzhou (because I don't have Chinese Resident permit) or in Hong Kong (because I don't have a Hong Kong ID). Do I have to go back to Indonesia to renew my passport and also to apply for the Z visa or is there any other solutions?

thank you!