Is the shock noise in the rear? Do you have air suspension? If it's in the rear and you DON'T have air suspension, it may just be your spring pads needing replacement. As the pads get deformed, the springs sit closer and closer to the subframe - have a look at that first.

__________________
2004 X5 3.0i
Born 02/04
Delivered 03/04